Fixed bug with incorrect size after queue clear and moved destruction of queue out of locking time
This commit is contained in:
@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
// system includes
|
// system includes
|
||||||
|
#include <atomic>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
|
|
||||||
@ -25,12 +26,12 @@ public:
|
|||||||
|
|
||||||
void clear();
|
void clear();
|
||||||
|
|
||||||
std::size_t size() const { return m_size; }
|
std::size_t size() const { return m_size.load(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
espcpputils::mutex_semaphore m_lock;
|
espcpputils::mutex_semaphore m_lock;
|
||||||
std::queue<T> m_queue;
|
std::queue<T> m_queue;
|
||||||
std::size_t m_size{}; // double-buffered to allow for reading without taking a lock
|
std::atomic<std::size_t> m_size{}; // double-buffered to allow for reading without taking a lock
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template<typename T>
|
||||||
@ -65,7 +66,16 @@ std::optional<T> LockingQueue<T>::tryPop()
|
|||||||
template<typename T>
|
template<typename T>
|
||||||
void LockingQueue<T>::clear()
|
void LockingQueue<T>::clear()
|
||||||
{
|
{
|
||||||
LockHelper helper{m_lock.handle};
|
std::queue<T> empty;
|
||||||
m_queue = {};
|
|
||||||
|
{
|
||||||
|
LockHelper helper{m_lock.handle};
|
||||||
|
//m_queue.clear();
|
||||||
|
//m_queue = {};
|
||||||
|
std::swap(empty, m_queue);
|
||||||
|
m_size = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deconstructing here the queue as the lock is already given back again
|
||||||
}
|
}
|
||||||
} // namespace espcpputils
|
} // namespace espcpputils
|
||||||
|
Reference in New Issue
Block a user