Skip to content

refactor intrusive list #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wokron wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor intrusive list #150

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 59 additions & 27 deletions include/condy/detail/intrusive.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ struct DoubleLinkEntry {
DoubleLinkEntry *prev = nullptr;
};

template <typename T, SingleLinkEntry T::*Member> class IntrusiveSingleList {
class SingleLinkListImpl {
public:
IntrusiveSingleList() = default;
IntrusiveSingleList(IntrusiveSingleList &&other) noexcept
SingleLinkListImpl() = default;
SingleLinkListImpl(SingleLinkListImpl &&other) noexcept
: head_(std::exchange(other.head_, nullptr)),
tail_(std::exchange(other.tail_, nullptr)) {}
IntrusiveSingleList &operator=(IntrusiveSingleList &&other) noexcept {
SingleLinkListImpl &operator=(SingleLinkListImpl &&other) noexcept {
if (this != &other) {
assert(empty());
head_ = std::exchange(other.head_, nullptr);
Expand All @@ -49,14 +49,11 @@ template <typename T, SingleLinkEntry T::*Member> class IntrusiveSingleList {
return *this;
}

CONDY_DELETE_COPY(IntrusiveSingleList);
CONDY_DELETE_COPY(SingleLinkListImpl);

public:
void push_back(T *item) noexcept {
assert(item != nullptr);
SingleLinkEntry *entry = &(item->*Member);
void push_back(SingleLinkEntry *entry) noexcept {
assert(entry != nullptr);
assert(entry->next == nullptr);
entry->next = nullptr;
if (!head_) {
head_ = entry;
tail_ = entry;
Expand All @@ -66,7 +63,7 @@ template <typename T, SingleLinkEntry T::*Member> class IntrusiveSingleList {
}
}

void push_back(IntrusiveSingleList other) noexcept {
void push_back(SingleLinkListImpl &other) noexcept {
if (other.empty()) {
return;
}
Expand All @@ -77,11 +74,13 @@ template <typename T, SingleLinkEntry T::*Member> class IntrusiveSingleList {
tail_->next = other.head_;
tail_ = other.tail_;
}
other.head_ = nullptr;
other.tail_ = nullptr;
}

bool empty() const noexcept { return head_ == nullptr; }

T *pop_front() noexcept {
SingleLinkEntry *pop_front() noexcept {
if (empty()) {
return nullptr;
}
Expand All @@ -91,21 +90,21 @@ template <typename T, SingleLinkEntry T::*Member> class IntrusiveSingleList {
tail_ = nullptr;
}
entry->next = nullptr;
return container_of(Member, entry);
return entry;
}

private:
SingleLinkEntry *head_ = nullptr;
SingleLinkEntry *tail_ = nullptr;
};

template <typename T, DoubleLinkEntry T::*Member> class IntrusiveDoubleList {
class DoubleLinkListImpl {
public:
IntrusiveDoubleList() = default;
IntrusiveDoubleList(IntrusiveDoubleList &&other) noexcept
DoubleLinkListImpl() = default;
DoubleLinkListImpl(DoubleLinkListImpl &&other) noexcept
: head_(std::exchange(other.head_, nullptr)),
tail_(std::exchange(other.tail_, nullptr)) {}
IntrusiveDoubleList &operator=(IntrusiveDoubleList &&other) noexcept {
DoubleLinkListImpl &operator=(DoubleLinkListImpl &&other) noexcept {
if (this != &other) {
assert(empty());
head_ = std::exchange(other.head_, nullptr);
Expand All @@ -114,12 +113,10 @@ template <typename T, DoubleLinkEntry T::*Member> class IntrusiveDoubleList {
return *this;
}

CONDY_DELETE_COPY(IntrusiveDoubleList);
CONDY_DELETE_COPY(DoubleLinkListImpl);

public:
void push_back(T *item) noexcept {
assert(item != nullptr);
DoubleLinkEntry *entry = &(item->*Member);
void push_back(DoubleLinkEntry *entry) noexcept {
assert(entry != nullptr);
assert(entry->next == nullptr && entry->prev == nullptr);
entry->next = nullptr;
entry->prev = tail_;
Expand All @@ -134,7 +131,7 @@ template <typename T, DoubleLinkEntry T::*Member> class IntrusiveDoubleList {

bool empty() const noexcept { return head_ == nullptr; }

T *pop_front() noexcept {
DoubleLinkEntry *pop_front() noexcept {
if (empty()) {
return nullptr;
}
Expand All @@ -147,12 +144,11 @@ template <typename T, DoubleLinkEntry T::*Member> class IntrusiveDoubleList {
}
entry->next = nullptr;
entry->prev = nullptr;
return container_of(Member, entry);
return entry;
}

bool remove(T *item) noexcept {
assert(item != nullptr);
DoubleLinkEntry *entry = &(item->*Member);
bool remove(DoubleLinkEntry *entry) noexcept {
assert(entry != nullptr);
if (entry->prev == nullptr && entry->next == nullptr &&
head_ != entry) {
return false;
Expand All @@ -179,5 +175,41 @@ template <typename T, DoubleLinkEntry T::*Member> class IntrusiveDoubleList {
DoubleLinkEntry *tail_ = nullptr;
};

template <typename T, SingleLinkEntry T::*Member> class IntrusiveSingleList {
public:
void push_back(T *item) noexcept { impl_.push_back(&(item->*Member)); }

void push_back(IntrusiveSingleList other) noexcept {
impl_.push_back(other.impl_);
}

bool empty() const noexcept { return impl_.empty(); }

T *pop_front() noexcept {
SingleLinkEntry *entry = impl_.pop_front();
return entry ? container_of(Member, entry) : nullptr;
}

private:
SingleLinkListImpl impl_;
};

template <typename T, DoubleLinkEntry T::*Member> class IntrusiveDoubleList {
public:
void push_back(T *item) noexcept { impl_.push_back(&(item->*Member)); }

bool empty() const noexcept { return impl_.empty(); }

T *pop_front() noexcept {
DoubleLinkEntry *entry = impl_.pop_front();
return entry ? container_of(Member, entry) : nullptr;
}

bool remove(T *item) noexcept { return impl_.remove(&(item->*Member)); }

private:
DoubleLinkListImpl impl_;
};

} // namespace detail
} // namespace condy
Loading