comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 21:58:37 -05:00
Code Issues Projects Releases Wiki Activity

ThreadBlockingQueue : remove useless/dangerous operations, forbid both copy and assignment.

Browse Source
This commit is contained in:
vsonnier 2017-09-10 19:35:12 +02:00
parent afedca05c6
commit aec0100f78
1 changed files with 5 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/util/ThreadBlockingQueue.h
View File

@ -42,12 +42,11 @@ public:
m_max_num_items = MIN_ITEM_NB; m_max_num_items = MIN_ITEM_NB;
}; };
//Copy constructor //Forbid Copy construction.
ThreadBlockingQueue(const ThreadBlockingQueue& sq) { ThreadBlockingQueue(const ThreadBlockingQueue& sq) = delete;
std::lock_guard < std::mutex > lock(sq.m_mutex);
m_queue = sq.m_queue; /*! Forbid copy assignment. */
m_max_num_items = sq.m_max_num_items; ThreadBlockingQueue& operator=(const ThreadBlockingQueue& sq) = delete;
}
/*! Destroy safe queue. */ /*! Destroy safe queue. */
~ThreadBlockingQueue() { ~ThreadBlockingQueue() {
@ -216,54 +215,7 @@ public:
m_cond_not_full.notify_all(); m_cond_not_full.notify_all();
} }
/**
* Swaps the contents.
* \param[out] sq The ThreadBlockingQueue to swap with 'this'.
*/
void swap(ThreadBlockingQueue& sq) {
if (this != &sq) {
std::lock_guard < std::mutex > lock1(m_mutex);
std::lock_guard < std::mutex > lock2(sq.m_mutex);
m_queue.swap(sq.m_queue);
std::swap(m_max_num_items, sq.m_max_num_items);
if (!m_queue.empty()) {
m_cond_not_empty.notify_all();
}
if (!sq.m_queue.empty()) {
sq.m_cond_not_empty.notify_all();
}
if (!m_queue.full()) {
m_cond_not_full.notify_all();
}
if (!sq.m_queue.full()) {
sq.m_cond_not_full.notify_all();
}
}
}
/*! The copy assignment operator */
ThreadBlockingQueue& operator=(const ThreadBlockingQueue& sq) {
if (this != &sq) {
std::lock_guard < std::mutex > lock1(m_mutex);
std::lock_guard < std::mutex > lock2(sq.m_mutex);
m_queue = sq.m_queue;
m_max_num_items = sq.m_max_num_items;
if (!m_queue.empty()) {
m_cond_not_empty.notify_all();
}
if (!m_queue.full()) {
m_cond_not_full.notify_all();
}
}
return *this;
}
private: private:
@ -274,9 +226,3 @@ private:
std::condition_variable m_cond_not_full; std::condition_variable m_cond_not_full;
size_t m_max_num_items = MIN_ITEM_NB; size_t m_max_num_items = MIN_ITEM_NB;
}; };
/*! Swaps the contents of two ThreadBlockingQueue objects. (external operator) */
template<typename T>
void swap(ThreadBlockingQueue<T>& q1, ThreadBlockingQueue<T>& q2) {
q1.swap(q2);
}