From de48af7a58bf645825ef9734ba3b765590f2d5fa Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 14 Feb 2019 19:20:34 -0500 Subject: [PATCH] Adapt all consumers of HashSet and HashMap to the slightly-different APIs. No functional changes intended. Tested and verified as working. Change-Id: Iaa67c2e5f0d9aff433ac7348e63e901a6a80e589 Reviewed-on: https://review.haiku-os.org/c/1043 Reviewed-by: waddlesplash --- headers/os/net/UrlContext.h | 11 +++-------- .../kernel/file_systems/netfs/client/ShareVolume.cpp | 2 +- .../file_systems/netfs/client/VolumeManager.cpp | 7 +------ .../file_systems/netfs/server/SecurityContext.cpp | 2 +- .../userlandfs/kernel_add_on/FileSystem.cpp | 2 +- .../userlandfs/kernel_add_on/UserlandFS.h | 3 ++- .../userlandfs/server/haiku/HaikuKernelVolume.cpp | 2 +- src/kits/network/libnetapi/NetworkCookieJar.cpp | 10 +++++----- src/kits/network/libnetapi/UrlContext.cpp | 6 +++++- src/servers/media/BufferManager.cpp | 2 +- 10 files changed, 21 insertions(+), 26 deletions(-) diff --git a/headers/os/net/UrlContext.h b/headers/os/net/UrlContext.h index 514c523ea4..97836abf73 100644 --- a/headers/os/net/UrlContext.h +++ b/headers/os/net/UrlContext.h @@ -14,12 +14,6 @@ #include -namespace BPrivate { - template class SynchronizedHashMap; - class HashString; -} - - class BUrlContext: public BReferenceable { public: BUrlContext(); @@ -41,10 +35,11 @@ public: uint16 GetProxyPort(); bool HasCertificateException(const BCertificate& certificate); +private: + class BHttpAuthenticationMap; + private: BNetworkCookieJar fCookieJar; - typedef BPrivate::SynchronizedHashMap BHttpAuthenticationMap; BHttpAuthenticationMap* fAuthenticationMap; typedef BObjectList BCertificateSet; BCertificateSet fCertificates; diff --git a/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp b/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp index 243d8ad296..ba8c038214 100644 --- a/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp +++ b/src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp @@ -345,9 +345,9 @@ PRINT(("ShareVolume::PrepareToUnmount()\n")); entry->GetDirectory()->GetID(), 0, entry->GetNode()->GetID(), entry->GetName()); - it.Remove(); _RemoveEntry(entry); } + fEntries->Clear(); // get all IDs int32 count = fNodes->Size(); diff --git a/src/add-ons/kernel/file_systems/netfs/client/VolumeManager.cpp b/src/add-ons/kernel/file_systems/netfs/client/VolumeManager.cpp index dfd0ea5f8f..a43a7edbb4 100644 --- a/src/add-ons/kernel/file_systems/netfs/client/VolumeManager.cpp +++ b/src/add-ons/kernel/file_systems/netfs/client/VolumeManager.cpp @@ -11,13 +11,8 @@ #include "VolumeManager.h" // VolumeSet -#ifdef B_HAIKU_64_BIT -struct VolumeManager::VolumeSet : HashSet > { +struct VolumeManager::VolumeSet : HashSet > { }; -#else -struct VolumeManager::VolumeSet : HashSet > { -}; -#endif // NodeIDVolumeMap struct VolumeManager::NodeIDVolumeMap : HashMap, Volume*> { diff --git a/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp b/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp index df39137fda..4ca5225ca4 100644 --- a/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp +++ b/src/add-ons/kernel/file_systems/netfs/server/SecurityContext.cpp @@ -682,7 +682,7 @@ SecurityContext::RemoveUser(User* user) it.HasNext();) { PermissionMap::Entry entry = it.Next(); if (entry.key.user == user) - it.Remove(); + fPermissions->Remove(it); } // surrender our user reference diff --git a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/FileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/FileSystem.cpp index c07e74a24b..52fc2149c4 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/FileSystem.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/FileSystem.cpp @@ -35,7 +35,7 @@ static const bigtime_t kNotificationRequestTimeout = 50000; // 50 ms struct FileSystem::SelectSyncMap - : public SynchronizedHashMap, int32*> { + : public SynchronizedHashMap, int32*, Locker> { }; diff --git a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/UserlandFS.h b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/UserlandFS.h index 0754f23564..bea4f79b1e 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/UserlandFS.h +++ b/src/add-ons/kernel/file_systems/userlandfs/kernel_add_on/UserlandFS.h @@ -8,6 +8,7 @@ #include #include "AutoLocker.h" +#include "Locker.h" #include "HashMap.h" #include "String.h" @@ -40,7 +41,7 @@ public: private: friend class KernelDebug; - typedef SynchronizedHashMap + typedef SynchronizedHashMap FileSystemMap; typedef AutoLocker FileSystemLocker; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp index e37e47279b..6e5f8595cf 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/HaikuKernelVolume.cpp @@ -26,7 +26,7 @@ // NodeMap class HaikuKernelVolume::NodeMap - : public SynchronizedHashMap, HaikuKernelNode*> { + : public SynchronizedHashMap, HaikuKernelNode*, Locker> { }; diff --git a/src/kits/network/libnetapi/NetworkCookieJar.cpp b/src/kits/network/libnetapi/NetworkCookieJar.cpp index f21977781f..e6e27ef098 100644 --- a/src/kits/network/libnetapi/NetworkCookieJar.cpp +++ b/src/kits/network/libnetapi/NetworkCookieJar.cpp @@ -84,7 +84,7 @@ BNetworkCookieJar::~BNetworkCookieJar() PrivateHashMap::Iterator it = fCookieHashMap->GetIterator(); while (it.HasNext()) { - BNetworkCookieList* list = *it.NextValue(); + BNetworkCookieList* list = it.Next().value; it.Remove(); list->LockForWriting(); delete list; @@ -599,14 +599,14 @@ BNetworkCookieJar::Iterator::NextDomain() fList->Unlock(); if (fCookieJar->fCookieHashMap->Lock()) { - fList = *fIterator->fCookieMapIterator.NextValue(); + fList = fIterator->fCookieMapIterator.Next().value; fList->LockForReading(); while (fList->CountItems() == 0 && fIterator->fCookieMapIterator.HasNext()) { // Empty list. Skip it fList->Unlock(); - fList = *fIterator->fCookieMapIterator.NextValue(); + fList = fIterator->fCookieMapIterator.Next().value; fList->LockForReading(); } @@ -688,14 +688,14 @@ BNetworkCookieJar::Iterator::_FindNext() fLastList = fList; if (fCookieJar->fCookieHashMap->Lock()) { - fList = *(fIterator->fCookieMapIterator.NextValue()); + fList = (fIterator->fCookieMapIterator.Next().value); fList->LockForReading(); while (fList->CountItems() == 0 && fIterator->fCookieMapIterator.HasNext()) { // Empty list. Skip it fList->Unlock(); - fList = *fIterator->fCookieMapIterator.NextValue(); + fList = fIterator->fCookieMapIterator.Next().value; fList->LockForReading(); } diff --git a/src/kits/network/libnetapi/UrlContext.cpp b/src/kits/network/libnetapi/UrlContext.cpp index 6e7ec48c0e..6a1a0d23a8 100644 --- a/src/kits/network/libnetapi/UrlContext.cpp +++ b/src/kits/network/libnetapi/UrlContext.cpp @@ -16,6 +16,10 @@ #include +class BUrlContext::BHttpAuthenticationMap : public + SynchronizedHashMap {}; + + BUrlContext::BUrlContext() : fCookieJar(), @@ -38,7 +42,7 @@ BUrlContext::~BUrlContext() BHttpAuthenticationMap::Iterator iterator = fAuthenticationMap->GetIterator(); while (iterator.HasNext()) - delete *iterator.NextValue(); + delete iterator.Next().value; delete fAuthenticationMap; } diff --git a/src/servers/media/BufferManager.cpp b/src/servers/media/BufferManager.cpp index c6e706b563..d9a0b7779e 100644 --- a/src/servers/media/BufferManager.cpp +++ b/src/servers/media/BufferManager.cpp @@ -174,7 +174,7 @@ BufferManager::Dump() BufferInfoMap::Iterator iterator = fBufferInfoMap.GetIterator(); while (iterator.HasNext()) { - buffer_info& info = *iterator.NextValue(); + buffer_info info = iterator.Next().value; printf(" buffer-id %" B_PRId32 ", area-id %" B_PRId32 ", offset %ld, " "size %ld, flags %#08" B_PRIx32 "\n", info.id, info.area, info.offset, info.size, info.flags);