From ce08f03c61c1b71103e59648b2139d8f1604b783 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 1 Apr 2023 11:31:48 -0400 Subject: [PATCH] kernel & add-ons: Adjustments to use DoublyLinkedList::InsertBefore. The Insert(before, element) function has been marked deprecated since 2010, but still had many usage and kept accumulating more. It's long past time we got rid of all them and actually deprecated the function itself. Insert(before, element) just calls InsertBefore, so no functional change. --- .../packagefs/nodes/UnpackingDirectory.cpp | 4 ++-- src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp | 10 +++++----- src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp | 10 +++++----- .../kernel/network/protocols/tcp/BufferQueue.cpp | 2 +- src/add-ons/kernel/network/stack/routes.cpp | 2 +- src/system/kernel/cache/block_cache.cpp | 2 +- src/system/kernel/device_manager/IOSchedulerSimple.cpp | 2 +- src/system/kernel/device_manager/device_manager.cpp | 2 +- src/system/kernel/fs/vfs.cpp | 2 +- src/system/kernel/low_resource_manager.cpp | 2 +- src/system/kernel/vm/VMKernelAddressSpace.cpp | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.cpp b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.cpp index 75ba3cb6ee..8c1191c870 100644 --- a/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/nodes/UnpackingDirectory.cpp @@ -113,7 +113,7 @@ UnpackingDirectory::AddPackageNode(PackageNode* packageNode, dev_t deviceID) || packageDirectory->HasPrecedenceOver(other); if (overridesHead) { - fPackageDirectories.Insert(other, packageDirectory); + fPackageDirectories.InsertBefore(other, packageDirectory); NodeReinitVFS(deviceID, fID, packageDirectory, other, fFlags); } else fPackageDirectories.Add(packageDirectory); @@ -141,7 +141,7 @@ UnpackingDirectory::RemovePackageNode(PackageNode* packageNode, dev_t deviceID) } fPackageDirectories.Remove(newestNode); - fPackageDirectories.Insert(fPackageDirectories.Head(), newestNode); + fPackageDirectories.InsertBefore(fPackageDirectories.Head(), newestNode); NodeReinitVFS(deviceID, fID, newestNode, packageNode, fFlags); } } diff --git a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp index 7407425411..dbc662e75b 100644 --- a/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp +++ b/src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp @@ -331,11 +331,11 @@ FragmentPacket::AddFragment(uint16 start, uint16 end, net_buffer* buffer, status_t status = gBufferModule->merge(buffer, previous, false); TRACE(" merge previous: %s", strerror(status)); if (status != B_OK) { - fFragments.Insert(next, previous); + fFragments.InsertBefore(next, previous); return status; } - fFragments.Insert(next, buffer); + fFragments.InsertBefore(next, buffer); // cut down existing hole fBytesLeft -= end - start; @@ -359,11 +359,11 @@ FragmentPacket::AddFragment(uint16 start, uint16 end, net_buffer* buffer, TRACE(" merge next: %s", strerror(status)); if (status != B_OK) { // Insert "next" at its previous position - fFragments.Insert(afterNext, next); + fFragments.InsertBefore(afterNext, next); return status; } - fFragments.Insert(afterNext, buffer); + fFragments.InsertBefore(afterNext, buffer); // cut down existing hole fBytesLeft -= end - start; @@ -384,7 +384,7 @@ FragmentPacket::AddFragment(uint16 start, uint16 end, net_buffer* buffer, buffer->fragment.start = start; buffer->fragment.end = end; - fFragments.Insert(next, buffer); + fFragments.InsertBefore(next, buffer); // update length of the hole, if any fBytesLeft -= end - start; diff --git a/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp b/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp index d72fde0f0f..f655937762 100644 --- a/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp +++ b/src/add-ons/kernel/network/protocols/ipv6/ipv6.cpp @@ -370,11 +370,11 @@ FragmentPacket::AddFragment(uint16 start, uint16 end, net_buffer* buffer, status_t status = gBufferModule->merge(buffer, previous, false); TRACE(" merge previous: %s", strerror(status)); if (status != B_OK) { - fFragments.Insert(next, previous); + fFragments.InsertBefore(next, previous); return status; } - fFragments.Insert(next, buffer); + fFragments.InsertBefore(next, buffer); // cut down existing hole fBytesLeft -= end - start; @@ -398,11 +398,11 @@ FragmentPacket::AddFragment(uint16 start, uint16 end, net_buffer* buffer, TRACE(" merge next: %s", strerror(status)); if (status != B_OK) { // Insert "next" at its previous position - fFragments.Insert(afterNext, next); + fFragments.InsertBefore(afterNext, next); return status; } - fFragments.Insert(afterNext, buffer); + fFragments.InsertBefore(afterNext, buffer); // cut down existing hole fBytesLeft -= end - start; @@ -423,7 +423,7 @@ FragmentPacket::AddFragment(uint16 start, uint16 end, net_buffer* buffer, buffer->fragment.start = start; buffer->fragment.end = end; - fFragments.Insert(next, buffer); + fFragments.InsertBefore(next, buffer); // update length of the hole, if any fBytesLeft -= end - start; diff --git a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp index 3700e085c6..9513770d97 100644 --- a/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/BufferQueue.cpp @@ -198,7 +198,7 @@ BufferQueue::Add(net_buffer *buffer, tcp_sequence sequence) return; } - fList.Insert(next, buffer); + fList.InsertBefore(next, buffer); buffer->sequence = sequence.Number(); fNumBytes += buffer->size; diff --git a/src/add-ons/kernel/network/stack/routes.cpp b/src/add-ons/kernel/network/stack/routes.cpp index a43cbef18d..ea55dc6f3e 100644 --- a/src/add-ons/kernel/network/stack/routes.cpp +++ b/src/add-ons/kernel/network/stack/routes.cpp @@ -513,7 +513,7 @@ add_route(struct net_domain* _domain, const struct net_route* newRoute) } } - domain->routes.Insert(before, route); + domain->routes.InsertBefore(before, route); update_route_infos(domain); return B_OK; diff --git a/src/system/kernel/cache/block_cache.cpp b/src/system/kernel/cache/block_cache.cpp index b9fe29074e..232add84d6 100644 --- a/src/system/kernel/cache/block_cache.cpp +++ b/src/system/kernel/cache/block_cache.cpp @@ -2549,7 +2549,7 @@ get_next_locked_block_cache(block_cache* last) if (cache != NULL) { mutex_lock(&cache->lock); - sCaches.Insert(sCaches.GetNext(cache), (block_cache*)&sMarkCache); + sCaches.InsertBefore(sCaches.GetNext(cache), (block_cache*)&sMarkCache); } return cache; diff --git a/src/system/kernel/device_manager/IOSchedulerSimple.cpp b/src/system/kernel/device_manager/IOSchedulerSimple.cpp index 1edaf5e08d..001bfee9e5 100644 --- a/src/system/kernel/device_manager/IOSchedulerSimple.cpp +++ b/src/system/kernel/device_manager/IOSchedulerSimple.cpp @@ -679,7 +679,7 @@ panic("no more requests for owner %p (thread %" B_PRId32 ")", owner, owner->thre // insert our marker, since the owner will be gone in the next // iteration. if (owner->requests.IsEmpty()) { - fActiveRequestOwners.Insert(owner, &marker); + fActiveRequestOwners.InsertBefore(owner, &marker); owner = NULL; } diff --git a/src/system/kernel/device_manager/device_manager.cpp b/src/system/kernel/device_manager/device_manager.cpp index 93f4a5308a..d7957848c3 100644 --- a/src/system/kernel/device_manager/device_manager.cpp +++ b/src/system/kernel/device_manager/device_manager.cpp @@ -1485,7 +1485,7 @@ device_node::AddChild(device_node* node) } } - fChildren.Insert(before, node); + fChildren.InsertBefore(before, node); } diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 4ed96e0251..e00b9700ae 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -8009,7 +8009,7 @@ fs_sync(dev_t device) if (vnode != NULL) { // insert marker vnode again - mount->vnodes.Insert(mount->vnodes.GetNext(vnode), &marker); + mount->vnodes.InsertBefore(mount->vnodes.GetNext(vnode), &marker); marker.SetRemoved(false); } diff --git a/src/system/kernel/low_resource_manager.cpp b/src/system/kernel/low_resource_manager.cpp index cee6cb764e..373946668e 100644 --- a/src/system/kernel/low_resource_manager.cpp +++ b/src/system/kernel/low_resource_manager.cpp @@ -488,7 +488,7 @@ register_low_resource_handler(low_resource_func function, void* data, low_resource_handler *handler = iterator.Next(); if (handler->priority >= priority) { - sLowResourceHandlers.Insert(last, newHandler); + sLowResourceHandlers.InsertBefore(last, newHandler); return B_OK; } last = handler; diff --git a/src/system/kernel/vm/VMKernelAddressSpace.cpp b/src/system/kernel/vm/VMKernelAddressSpace.cpp index f60364bf85..81c58b9c4d 100644 --- a/src/system/kernel/vm/VMKernelAddressSpace.cpp +++ b/src/system/kernel/vm/VMKernelAddressSpace.cpp @@ -545,7 +545,7 @@ VMKernelAddressSpace::_InsertRange(Range* range) // insert at the correct position in the range list Range* insertBeforeRange = fRangeTree.FindClosest(range->base, true); - fRangeList.Insert( + fRangeList.InsertBefore( insertBeforeRange != NULL ? fRangeList.GetNext(insertBeforeRange) : fRangeList.Head(), range);