alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils/async-queue: appease helgrind

Browse Source 
We used notify_one _outside_ the lock; that should be just fine... but helgrind
doesn't like it, so let's appease it.
This commit is contained in:
Dirk-Jan C. Binnema
2022-02-16 22:13:05 +02:00
parent d2a75f600d
commit 1db70c05e6
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/utils/mu-async-queue.hh
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020-2022 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This program is free software; you can redistribute it and/or modify it ** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the ** under the terms of the GNU General Public License as published by the
@ -47,9 +47,17 @@ class AsyncQueue {
#define LOCKED std::unique_lock<std::mutex> lock(m_); #define LOCKED std::unique_lock<std::mutex> lock(m_);
/**
* Push an item to the end of the queue by moving it
*
* @param item the item to move to the end of the queue
* @param timeout and optional timeout
*
* @return true if the item was pushed; false otherwise.
*/
bool push(const value_type& item, Timeout timeout = {}) bool push(const value_type& item, Timeout timeout = {})
{ {
return push(std::move(value_type(item))); return push(std::move(value_type(item)), timeout);
} }
/** /**
@ -62,7 +70,7 @@ class AsyncQueue {
*/ */
bool push(value_type&& item, Timeout timeout = {}) bool push(value_type&& item, Timeout timeout = {})
{ {
LOCKED; std::unique_lock lock{m_};
if (!unlimited()) { if (!unlimited()) {
const auto rv = cv_full_.wait_for(lock, timeout, [&]() { const auto rv = cv_full_.wait_for(lock, timeout, [&]() {
@ -73,9 +81,8 @@ class AsyncQueue {
} }
q_.emplace_back(std::move(item)); q_.emplace_back(std::move(item));
lock.unlock();
cv_empty_.notify_one(); cv_empty_.notify_one();
return true; return true;
} }
@ -89,7 +96,7 @@ class AsyncQueue {
*/ */
bool pop(value_type& val, Timeout timeout = {}) bool pop(value_type& val, Timeout timeout = {})
{ {
LOCKED; std::unique_lock lock{m_};
if (timeout != Timeout{}) { if (timeout != Timeout{}) {
const auto rv = cv_empty_.wait_for(lock, timeout, [&]() { const auto rv = cv_empty_.wait_for(lock, timeout, [&]() {
@ -103,7 +110,6 @@ class AsyncQueue {
val = std::move(q_.front()); val = std::move(q_.front());
q_.pop_front(); q_.pop_front();
lock.unlock();
cv_full_.notify_one(); cv_full_.notify_one();
return true; return true;
@ -115,9 +121,8 @@ class AsyncQueue {
*/ */
void clear() void clear()
{ {
LOCKED; std::unique_lock lock{m_};
q_.clear(); q_.clear();
lock.unlock();
cv_full_.notify_one(); cv_full_.notify_one();
} }
@ -129,7 +134,7 @@ class AsyncQueue {
*/ */
size_type size() const size_type size() const
{ {
LOCKED; std::unique_lock lock{m_};
return q_.size(); return q_.size();
} }
@ -155,7 +160,7 @@ class AsyncQueue {
*/ */
bool empty() const bool empty() const
{ {
LOCKED; std::unique_lock lock{m_};
return q_.empty(); return q_.empty();
} }
@ -170,7 +175,7 @@ class AsyncQueue {
if (unlimited()) if (unlimited())
return false; return false;
LOCKED; std::unique_lock lock{m_};
return full_unlocked(); return full_unlocked();
} }