diff options
| author | B3n30 <benediktthomas@gmail.com> | 2018-10-08 23:28:54 +0200 |
|---|---|---|
| committer | fearlessTobi <thm.frey@gmail.com> | 2019-02-15 22:14:54 +0100 |
| commit | 2195f10d152a52e01ccab0a6528f8758752d66a9 (patch) | |
| tree | 6bf2fb03d0df8224a44259eed4a773bc67fe4b45 /src/common/threadsafe_queue.h | |
| parent | 41549365680f0aae3f82e5812f3470305e939f7d (diff) | |
Adressed review comments
Diffstat (limited to 'src/common/threadsafe_queue.h')
| -rw-r--r-- | src/common/threadsafe_queue.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/common/threadsafe_queue.h b/src/common/threadsafe_queue.h index 4fdcecca0f..821e8536a4 100644 --- a/src/common/threadsafe_queue.h +++ b/src/common/threadsafe_queue.h @@ -40,7 +40,7 @@ public: template <typename Arg> void Push(Arg&& t) { // create the element, add it to the queue - write_ptr->current = std::move(t); + write_ptr->current = std::forward<Arg>(t); // set the next pointer to a new element ptr // then advance the write pointer ElementPtr* new_ptr = new ElementPtr(); @@ -69,7 +69,6 @@ public: --size; ElementPtr* tmpptr = read_ptr; - read_ptr = tmpptr->next.load(std::memory_order_acquire); t = std::move(tmpptr->current); tmpptr->next.store(nullptr); @@ -77,12 +76,14 @@ public: return true; } - bool PopWait(T& t) { + T PopWait() { if (Empty()) { std::unique_lock<std::mutex> lock(cv_mutex); cv.wait(lock, [this]() { return !Empty(); }); } - return Pop(t); + T t; + Pop(t); + return t; } // not thread-safe @@ -148,8 +149,8 @@ public: return spsc_queue.Pop(t); } - bool PopWait(T& t) { - return spsc_queue.PopWait(t); + T PopWait() { + return spsc_queue.PopWait(); } // not thread-safe |