Skip to content

fix: move task such as it is destory after complete, to release potential shared ptr holding #15633

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: move task such as it is destory after complete, to release potential shared ptr holding #15633

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
14 changes: 13 additions & 1 deletion cyber/base/bounded_queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ class BoundedQueue {
T* pool_ = nullptr;
std::unique_ptr<WaitStrategy> wait_strategy_ = nullptr;
volatile bool break_all_wait_ = false;

template<typename U = T>
typename std::enable_if<std::is_move_assignable<U>::value, void>::type
assign(T* element, uint64_t new_head) {
*element = std::move(pool_[GetIndex(new_head)]);
}

template<typename U = T>
typename std::enable_if<!std::is_move_assignable<U>::value, void>::type
assign(T* element, uint64_t new_head) {
*element = pool_[GetIndex(new_head)];
}
};

template <typename T>
Expand Down Expand Up @@ -161,10 +173,10 @@ bool BoundedQueue<T>::Dequeue(T* element) {
if (new_head == commit_.load(std::memory_order_acquire)) {
return false;
}
*element = pool_[GetIndex(new_head)];
} while (!head_.compare_exchange_weak(old_head, new_head,
std::memory_order_acq_rel,
std::memory_order_relaxed));
assign(element, new_head);
return true;
}

Expand Down