From 254894210cbc88928304387583da77297390658a Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 10 Dec 2024 23:14:23 -0500 Subject: [PATCH] LinkedLists: Rename MoveFrom method to TakeFrom. "Move" now sounds like it has 'move' semantics (i.e. replaces this structure's data with the other structure's data), while MoveFrom() really had 'move+append' semantics (appends the other list's elements to this list, and clears the other list.) To make this clearer, it's here renamed to "TakeFrom". This should reduce confusion with the other move-related APIs that are starting to show up in the Haiku tree (e.g. "MoveFrom" in BRegion.) Change-Id: Ib0a61a9c12fe8812020efd55a2a0818883883e2a Reviewed-on: https://review.haiku-os.org/c/haiku/+/8634 Tested-by: Commit checker robot Reviewed-by: waddlesplash Reviewed-by: X512 X512 --- headers/private/fs_shell/DoublyLinkedList.h | 6 +++--- headers/private/kernel/util/DoublyLinkedList.h | 6 +++--- headers/private/kernel/util/DoublyLinkedQueue.h | 6 +++--- headers/private/kernel/util/SinglyLinkedList.h | 4 ++-- .../file_systems/packagefs/indices/AttributeIndex.cpp | 2 +- .../file_systems/packagefs/indices/LastModifiedIndex.cpp | 2 +- .../kernel/file_systems/packagefs/indices/SizeIndex.cpp | 2 +- .../file_systems/packagefs/nodes/UnpackingLeafNode.cpp | 2 +- .../file_systems/packagefs/package/CachedDataReader.cpp | 2 +- .../file_systems/packagefs/resolvables/Resolvable.cpp | 2 +- src/add-ons/kernel/file_systems/ramfs/Directory.cpp | 2 +- src/add-ons/kernel/file_systems/ramfs/Node.cpp | 2 +- src/add-ons/kernel/network/stack/ancillary_data.cpp | 2 +- src/apps/debuganalyzer/model_loader/ModelLoader.cpp | 2 +- src/kits/media/TimedEventQueue.cpp | 2 +- src/servers/package/Volume.cpp | 2 +- .../arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp | 2 +- src/system/kernel/arch/arm64/VMSAv8TranslationMap.cpp | 2 +- .../kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp | 2 +- .../kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp | 2 +- .../arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp | 2 +- src/system/kernel/arch/riscv64/RISCV64VMTranslationMap.cpp | 2 +- .../arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp | 2 +- .../arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp | 2 +- .../kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp | 2 +- src/system/kernel/debug/core_dump.cpp | 2 +- src/system/kernel/device_manager/IOSchedulerSimple.cpp | 4 ++-- src/system/kernel/heap.cpp | 4 ++-- src/system/kernel/team.cpp | 6 +++--- src/system/kernel/vm/VMPageQueue.h | 2 +- src/system/kernel/vm/vm_page.cpp | 2 +- 31 files changed, 42 insertions(+), 42 deletions(-) diff --git a/headers/private/fs_shell/DoublyLinkedList.h b/headers/private/fs_shell/DoublyLinkedList.h index 1872f6c323..66cb5b8282 100644 --- a/headers/private/fs_shell/DoublyLinkedList.h +++ b/headers/private/fs_shell/DoublyLinkedList.h @@ -335,7 +335,7 @@ public: inline void Swap(Element *a, Element *b); - inline void MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList); + inline void TakeFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList); inline void RemoveAll(); inline void MakeEmpty() { RemoveAll(); } @@ -516,10 +516,10 @@ DOUBLY_LINKED_LIST_CLASS_NAME::Swap(Element *a, Element *b) } } -// MoveFrom +// TakeFrom DOUBLY_LINKED_LIST_TEMPLATE_LIST void -DOUBLY_LINKED_LIST_CLASS_NAME::MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList) +DOUBLY_LINKED_LIST_CLASS_NAME::TakeFrom(DOUBLY_LINKED_LIST_CLASS_NAME *fromList) { if (fromList && fromList->fFirst) { if (fFirst) { diff --git a/headers/private/kernel/util/DoublyLinkedList.h b/headers/private/kernel/util/DoublyLinkedList.h index 4824eb0913..6194567e6e 100644 --- a/headers/private/kernel/util/DoublyLinkedList.h +++ b/headers/private/kernel/util/DoublyLinkedList.h @@ -340,7 +340,7 @@ public: inline void Swap(Element* a, Element* b); - inline void MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME* fromList); + inline void TakeFrom(DOUBLY_LINKED_LIST_CLASS_NAME* fromList); inline void RemoveAll(); inline void MakeEmpty() { RemoveAll(); } @@ -552,10 +552,10 @@ DOUBLY_LINKED_LIST_CLASS_NAME::Swap(Element* a, Element* b) } } -// MoveFrom +// TakeFrom DOUBLY_LINKED_LIST_TEMPLATE_LIST void -DOUBLY_LINKED_LIST_CLASS_NAME::MoveFrom(DOUBLY_LINKED_LIST_CLASS_NAME* fromList) +DOUBLY_LINKED_LIST_CLASS_NAME::TakeFrom(DOUBLY_LINKED_LIST_CLASS_NAME* fromList) { if (fromList && fromList->fFirst) { if (fFirst) { diff --git a/headers/private/kernel/util/DoublyLinkedQueue.h b/headers/private/kernel/util/DoublyLinkedQueue.h index 4e85a91dc1..bcaaf770f1 100644 --- a/headers/private/kernel/util/DoublyLinkedQueue.h +++ b/headers/private/kernel/util/DoublyLinkedQueue.h @@ -145,7 +145,7 @@ public: inline void Swap(Element *a, Element *b); - inline void MoveFrom(DOUBLY_LINKED_QUEUE_CLASS_NAME *fromList); + inline void TakeFrom(DOUBLY_LINKED_QUEUE_CLASS_NAME *fromList); inline void RemoveAll(); inline void MakeEmpty() { RemoveAll(); } @@ -281,10 +281,10 @@ DOUBLY_LINKED_QUEUE_CLASS_NAME::Swap(Element *a, Element *b) } } -// MoveFrom +// TakeFrom DOUBLY_LINKED_LIST_TEMPLATE_LIST void -DOUBLY_LINKED_QUEUE_CLASS_NAME::MoveFrom(DOUBLY_LINKED_QUEUE_CLASS_NAME *fromList) +DOUBLY_LINKED_QUEUE_CLASS_NAME::TakeFrom(DOUBLY_LINKED_QUEUE_CLASS_NAME *fromList) { if (fromList && fromList->fFirst) { if (fFirst) { diff --git a/headers/private/kernel/util/SinglyLinkedList.h b/headers/private/kernel/util/SinglyLinkedList.h index c5ca4e47c2..6fe04395ef 100644 --- a/headers/private/kernel/util/SinglyLinkedList.h +++ b/headers/private/kernel/util/SinglyLinkedList.h @@ -148,7 +148,7 @@ class SinglyLinkedList { inline bool Remove(Element* element); inline void Remove(Element* previous, Element* element); - inline void MoveFrom(SINGLY_LINKED_LIST_CLASS_NAME* fromList); + inline void TakeFrom(SINGLY_LINKED_LIST_CLASS_NAME* fromList); // O(1) if either list is empty, otherwise O(n). inline void RemoveAll(); @@ -240,7 +240,7 @@ SINGLY_LINKED_LIST_CLASS_NAME::Remove(Element* previous, Element* element) SINGLY_LINKED_LIST_TEMPLATE_LIST void -SINGLY_LINKED_LIST_CLASS_NAME::MoveFrom(SINGLY_LINKED_LIST_CLASS_NAME* fromList) +SINGLY_LINKED_LIST_CLASS_NAME::TakeFrom(SINGLY_LINKED_LIST_CLASS_NAME* fromList) { if (fromList->fFirst == NULL) return; diff --git a/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.cpp index 17e05bd692..5175079993 100644 --- a/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/indices/AttributeIndex.cpp @@ -332,7 +332,7 @@ AttributeIndex::NodeChanged(Node* node, uint32 statFields, const OldNodeAttributes& oldAttributes) { IteratorList iterators; - iterators.MoveFrom(fIteratorsToUpdate); + iterators.TakeFrom(fIteratorsToUpdate); TreeValue* oldTreeValue = (TreeValue*)oldAttributes.IndexCookieForAttribute(Name()); diff --git a/src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.cpp index c58fef198c..9cd64486af 100644 --- a/src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/indices/LastModifiedIndex.cpp @@ -200,7 +200,7 @@ LastModifiedIndex::NodeChanged(Node* node, uint32 statFields, const OldNodeAttributes& oldAttributes) { IteratorList iterators; - iterators.MoveFrom(fIteratorsToUpdate); + iterators.TakeFrom(fIteratorsToUpdate); time_t oldLastModified = oldAttributes.ModifiedTime().tv_sec; time_t newLastModified = node->ModifiedTime().tv_sec; diff --git a/src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.cpp index 4003d9e0a2..31458458b2 100644 --- a/src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/indices/SizeIndex.cpp @@ -199,7 +199,7 @@ SizeIndex::NodeChanged(Node* node, uint32 statFields, const OldNodeAttributes& oldAttributes) { IteratorList iterators; - iterators.MoveFrom(fIteratorsToUpdate); + iterators.TakeFrom(fIteratorsToUpdate); off_t oldSize = oldAttributes.FileSize(); off_t newSize = node->FileSize(); diff --git a/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.cpp index 45b6a9a7af..7cfa3a9672 100644 --- a/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingLeafNode.cpp @@ -231,7 +231,7 @@ UnpackingLeafNode::CloneTransferPackageNodes(ino_t id, UnpackingNode*& _newNode) fFinalPackageNode = fPackageNodes.Head(); if (fFinalPackageNode != NULL) { fFinalPackageNode->AcquireReference(); - clone->fPackageNodes.MoveFrom(&fPackageNodes); + clone->fPackageNodes.TakeFrom(&fPackageNodes); } _newNode = clone; diff --git a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp index 4edc2f0e79..342d4346f6 100644 --- a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp @@ -436,7 +436,7 @@ CachedDataReader::_UnlockCacheLine(CacheLineLocker* lineLocker) fCacheLineLockers.Remove(lineLocker); if (CacheLineLocker* nextLineLocker = lineLocker->Queue().RemoveHead()) { - nextLineLocker->Queue().MoveFrom(&lineLocker->Queue()); + nextLineLocker->Queue().TakeFrom(&lineLocker->Queue()); fCacheLineLockers.Insert(nextLineLocker); nextLineLocker->WakeUp(); } diff --git a/src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.cpp b/src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.cpp index b8daec8499..59bf735701 100644 --- a/src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/resolvables/Resolvable.cpp @@ -70,5 +70,5 @@ Resolvable::MoveDependencies(ResolvableDependencyList& dependencies) dependency->SetResolvable(NULL); } - dependencies.MoveFrom(&fDependencies); + dependencies.TakeFrom(&fDependencies); } diff --git a/src/add-ons/kernel/file_systems/ramfs/Directory.cpp b/src/add-ons/kernel/file_systems/ramfs/Directory.cpp index 3609b5b8ee..cb1fa46374 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Directory.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/Directory.cpp @@ -205,7 +205,7 @@ Directory::RemoveEntry(Entry *entry) if (nextEntry) { DoublyLinkedList *nextIterators = nextEntry->GetEntryIteratorList(); - nextIterators->MoveFrom(iterators); + nextIterators->TakeFrom(iterators); } else iterators->RemoveAll(); GetVolume()->IteratorUnlock(); diff --git a/src/add-ons/kernel/file_systems/ramfs/Node.cpp b/src/add-ons/kernel/file_systems/ramfs/Node.cpp index 136113b469..2d1ce1748a 100644 --- a/src/add-ons/kernel/file_systems/ramfs/Node.cpp +++ b/src/add-ons/kernel/file_systems/ramfs/Node.cpp @@ -215,7 +215,7 @@ Node::RemoveAttribute(Attribute *attribute) if (nextAttr != NULL) { DoublyLinkedList *nextIterators = nextAttr->GetAttributeIteratorList(); - nextIterators->MoveFrom(iterators); + nextIterators->TakeFrom(iterators); } else iterators->RemoveAll(); diff --git a/src/add-ons/kernel/network/stack/ancillary_data.cpp b/src/add-ons/kernel/network/stack/ancillary_data.cpp index ba1e276d94..4c307e1448 100644 --- a/src/add-ons/kernel/network/stack/ancillary_data.cpp +++ b/src/add-ons/kernel/network/stack/ancillary_data.cpp @@ -159,7 +159,7 @@ move_ancillary_data(ancillary_data_container* from, return NULL; ancillary_data *ancillaryData = from->data_list.Head(); - to->data_list.MoveFrom(&from->data_list); + to->data_list.TakeFrom(&from->data_list); return ancillaryData != NULL ? ancillaryData->Data() : NULL; } diff --git a/src/apps/debuganalyzer/model_loader/ModelLoader.cpp b/src/apps/debuganalyzer/model_loader/ModelLoader.cpp index fa66f7ea19..9412535193 100644 --- a/src/apps/debuganalyzer/model_loader/ModelLoader.cpp +++ b/src/apps/debuganalyzer/model_loader/ModelLoader.cpp @@ -241,7 +241,7 @@ struct ModelLoader::ExtendedThreadSchedulingState bool PrepareThreadIORequests(Model::IORequest**& _requests, size_t& _requestCount) { - fIORequests.MoveFrom(&fPendingIORequests); + fIORequests.TakeFrom(&fPendingIORequests); size_t requestCount = fIORequests.Count(); if (requestCount == 0) { diff --git a/src/kits/media/TimedEventQueue.cpp b/src/kits/media/TimedEventQueue.cpp index 1e6585c474..4d1d94695d 100644 --- a/src/kits/media/TimedEventQueue.cpp +++ b/src/kits/media/TimedEventQueue.cpp @@ -502,7 +502,7 @@ BTimedEventQueue::DoForEach(for_each_hook hook, void* context, if (resort) { QueueEntryList entries; - entries.MoveFrom(&fData->fEvents); + entries.TakeFrom(&fData->fEvents); fData->fEventCount = 0; while (queue_entry* entry = entries.RemoveHead()) diff --git a/src/servers/package/Volume.cpp b/src/servers/package/Volume.cpp index 2f7cadeacd..a7ae606025 100644 --- a/src/servers/package/Volume.cpp +++ b/src/servers/package/Volume.cpp @@ -731,7 +731,7 @@ Volume::ProcessPendingNodeMonitorEvents() NodeMonitorEventList events; { AutoLocker eventsLock(fPendingNodeMonitorEventsLock); - events.MoveFrom(&fPendingNodeMonitorEvents); + events.TakeFrom(&fPendingNodeMonitorEvents); } // process them diff --git a/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp b/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp index c1462426b6..54946f9be2 100644 --- a/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp +++ b/src/system/kernel/arch/arm/paging/32bit/ARMVMTranslationMap32Bit.cpp @@ -538,7 +538,7 @@ ARMVMTranslationMap32Bit::UnmapArea(VMArea* area, bool deletingAddressSpace, RecursiveLocker locker(fLock); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/arm64/VMSAv8TranslationMap.cpp b/src/system/kernel/arch/arm64/VMSAv8TranslationMap.cpp index 9b26f76b2d..47339f867e 100644 --- a/src/system/kernel/arch/arm64/VMSAv8TranslationMap.cpp +++ b/src/system/kernel/arch/arm64/VMSAv8TranslationMap.cpp @@ -763,7 +763,7 @@ VMSAv8TranslationMap::UnmapArea(VMArea* area, bool deletingAddressSpace, ThreadCPUPinner pinner(thread_get_current_thread()); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp b/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp index f2fa356735..90b871649e 100644 --- a/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp +++ b/src/system/kernel/arch/m68k/paging/040/M68KVMTranslationMap040.cpp @@ -659,7 +659,7 @@ M68KVMTranslationMap040::UnmapArea(VMArea* area, bool deletingAddressSpace, RecursiveLocker locker(fLock); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp b/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp index 13fdfe6a40..bf6549c2a8 100644 --- a/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp +++ b/src/system/kernel/arch/ppc/paging/460/PPCVMTranslationMap460.cpp @@ -887,7 +887,7 @@ PPCVMTranslationMap460::UnmapArea(VMArea* area, bool deletingAddressSpace, RecursiveLocker locker(fLock); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp b/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp index 1e7b70e5c4..6cb83f7790 100644 --- a/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp +++ b/src/system/kernel/arch/ppc/paging/classic/PPCVMTranslationMapClassic.cpp @@ -887,7 +887,7 @@ PPCVMTranslationMapClassic::UnmapArea(VMArea* area, bool deletingAddressSpace, RecursiveLocker locker(fLock); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/riscv64/RISCV64VMTranslationMap.cpp b/src/system/kernel/arch/riscv64/RISCV64VMTranslationMap.cpp index d88fe3c563..44360f0ca1 100644 --- a/src/system/kernel/arch/riscv64/RISCV64VMTranslationMap.cpp +++ b/src/system/kernel/arch/riscv64/RISCV64VMTranslationMap.cpp @@ -479,7 +479,7 @@ RISCV64VMTranslationMap::UnmapArea(VMArea* area, bool deletingAddressSpace, ThreadCPUPinner pinner(thread_get_current_thread()); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp b/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp index ca55208dbc..ec8f6a105a 100644 --- a/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp +++ b/src/system/kernel/arch/x86/paging/32bit/X86VMTranslationMap32Bit.cpp @@ -521,7 +521,7 @@ X86VMTranslationMap32Bit::UnmapArea(VMArea* area, bool deletingAddressSpace, RecursiveLocker locker(fLock); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp b/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp index 5e2f880d75..83cef2786a 100644 --- a/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp +++ b/src/system/kernel/arch/x86/paging/64bit/X86VMTranslationMap64Bit.cpp @@ -524,7 +524,7 @@ X86VMTranslationMap64Bit::UnmapArea(VMArea* area, bool deletingAddressSpace, ThreadCPUPinner pinner(thread_get_current_thread()); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp b/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp index 4128cb1e3a..33bd8193b9 100644 --- a/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp +++ b/src/system/kernel/arch/x86/paging/pae/X86VMTranslationMapPAE.cpp @@ -766,7 +766,7 @@ X86VMTranslationMapPAE::UnmapArea(VMArea* area, bool deletingAddressSpace, RecursiveLocker locker(fLock); VMAreaMappings mappings; - mappings.MoveFrom(&area->mappings); + mappings.TakeFrom(&area->mappings); for (VMAreaMappings::Iterator it = mappings.GetIterator(); vm_page_mapping* mapping = it.Next();) { diff --git a/src/system/kernel/debug/core_dump.cpp b/src/system/kernel/debug/core_dump.cpp index 018d94d7ff..c1ec010418 100644 --- a/src/system/kernel/debug/core_dump.cpp +++ b/src/system/kernel/debug/core_dump.cpp @@ -923,7 +923,7 @@ private: teamLocker.Unlock(); - fPreAllocatedThreadStates.MoveFrom(&fThreadStates); + fPreAllocatedThreadStates.TakeFrom(&fThreadStates); if (!_PreAllocateThreadStates(missing)) return false; diff --git a/src/system/kernel/device_manager/IOSchedulerSimple.cpp b/src/system/kernel/device_manager/IOSchedulerSimple.cpp index c1daa0ae22..fa2fcd1d58 100644 --- a/src/system/kernel/device_manager/IOSchedulerSimple.cpp +++ b/src/system/kernel/device_manager/IOSchedulerSimple.cpp @@ -365,7 +365,7 @@ IOSchedulerSimple::_Finisher() } else { // Remove the request from the request owner. IORequestOwner* owner = request->Owner(); - owner->requests.MoveFrom(&owner->completed_requests); + owner->requests.TakeFrom(&owner->completed_requests); owner->requests.Remove(request); request->SetOwner(NULL); @@ -809,6 +809,6 @@ IOSchedulerSimple::_GetRequestOwner(team_id team, thread_id thread, existingOwners.Add(owner); } - fUnusedRequestOwners.MoveFrom(&existingOwners); + fUnusedRequestOwners.TakeFrom(&existingOwners); return owner; } diff --git a/src/system/kernel/heap.cpp b/src/system/kernel/heap.cpp index 41015e6c2e..a67a41ecc4 100644 --- a/src/system/kernel/heap.cpp +++ b/src/system/kernel/heap.cpp @@ -2009,10 +2009,10 @@ deferred_deleter(void *arg, int iteration) return; DeferredFreeList entries; - entries.MoveFrom(&sDeferredFreeList); + entries.TakeFrom(&sDeferredFreeList); DeferredDeletableList deletables; - deletables.MoveFrom(&sDeferredDeletableList); + deletables.TakeFrom(&sDeferredDeletableList); locker.Unlock(); diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp index ccca069acd..8f1b1df69b 100644 --- a/src/system/kernel/team.cpp +++ b/src/system/kernel/team.cpp @@ -3170,9 +3170,9 @@ team_remove_team(Team* team, pid_t& _signalGroup) insert_team_into_parent(sKernelTeam, child); // move job control entries too - sKernelTeam->stopped_children.entries.MoveFrom( + sKernelTeam->stopped_children.entries.TakeFrom( &team->stopped_children.entries); - sKernelTeam->continued_children.entries.MoveFrom( + sKernelTeam->continued_children.entries.TakeFrom( &team->continued_children.entries); // If the team was a session leader with controlling terminal, @@ -3741,7 +3741,7 @@ AssociatedDataOwner::PrepareForDeletion() // move all data to a temporary list and unset the owner DataList list; - list.MoveFrom(&fList); + list.TakeFrom(&fList); for (DataList::Iterator it = list.GetIterator(); AssociatedData* data = it.Next();) { diff --git a/src/system/kernel/vm/VMPageQueue.h b/src/system/kernel/vm/VMPageQueue.h index 87f3b51d41..50bff83e6e 100644 --- a/src/system/kernel/vm/VMPageQueue.h +++ b/src/system/kernel/vm/VMPageQueue.h @@ -204,7 +204,7 @@ VMPageQueue::AppendUnlocked(PageList& pages, uint32 count) InterruptsSpinLocker locker(fLock); - fPages.MoveFrom(&pages); + fPages.TakeFrom(&pages); fCount += count; } diff --git a/src/system/kernel/vm/vm_page.cpp b/src/system/kernel/vm/vm_page.cpp index b151e3a6ab..60851c8058 100644 --- a/src/system/kernel/vm/vm_page.cpp +++ b/src/system/kernel/vm/vm_page.cpp @@ -3881,7 +3881,7 @@ allocate_page_run(page_num_t start, page_num_t length, uint32 flags, // add pages to target queue if (pageState < PAGE_STATE_FIRST_UNQUEUED) { - freePages.MoveFrom(&clearPages); + freePages.TakeFrom(&clearPages); sPageQueues[pageState].AppendUnlocked(freePages, length); }