oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/IntrusiveList: move code to IntrusiveListNode::Connect()

Browse Source
This commit is contained in:
Max Kellermann 2022-11-10 16:46:19 +01:00
parent 440c676be2
commit 5670d98c54
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/IntrusiveList.hxx
View File

@ -1,5 +1,5 @@
/*
* Copyright 2020 Max Kellermann <max.kellermann@gmail.com>
* Copyright 2022 Max Kellermann <max.kellermann@gmail.com>
* All rights reserved.
*
* author: Max Kellermann <mk@cm4all.com>
@ -42,6 +42,12 @@
struct IntrusiveListNode {
IntrusiveListNode *next, *prev;
static constexpr void Connect(IntrusiveListNode &a,
IntrusiveListNode &b) noexcept {
a.next = &b;
b.prev = &a;
}
};
class IntrusiveListHook {
@ -59,8 +65,7 @@ public:
IntrusiveListHook &operator=(const IntrusiveListHook &) = delete;
void unlink() noexcept {
siblings.next->prev = siblings.prev;
siblings.prev->next = siblings.next;
IntrusiveListNode::Connect(*siblings.prev, *siblings.next);
}
private:
@ -493,10 +498,9 @@ public:
auto &existing_node = ToNode(*p);
auto &new_node = ToNode(t);
existing_node.prev->next = &new_node;
new_node.prev = existing_node.prev;
existing_node.prev = &new_node;
new_node.next = &existing_node;
IntrusiveListNode::Connect(*existing_node.prev,
new_node);
IntrusiveListNode::Connect(new_node, existing_node);
++counter;
}