Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-24 01:31:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use wpi mutex and condition_variable. (#52)

Browse Source
This commit is contained in:
Peter Johnson
2017-11-12 22:12:03 -08:00
committed by GitHub
parent e45b6e0f65
commit 80618a2e64
4 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/native/include/support/ConcurrentQueue.h
View File

@@ -9,8 +9,9 @@
#include <queue>
#include <thread>
#include <mutex>
#include <condition_variable>
#include "support/mutex.h"
#include "support/condition_variable.h"
namespace wpi {
@@ -18,17 +19,17 @@ template <typename T>
class ConcurrentQueue {
public:
bool empty() const {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
return queue_.empty();
}
typename std::queue<T>::size_type size() const {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
return queue_.size();
}
T pop() {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
while (queue_.empty()) {
cond_.wait(mlock);
}
@@ -38,7 +39,7 @@ class ConcurrentQueue {
}
void pop(T& item) {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
while (queue_.empty()) {
cond_.wait(mlock);
}
@@ -47,14 +48,14 @@ class ConcurrentQueue {
}
void push(const T& item) {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
queue_.push(item);
mlock.unlock();
cond_.notify_one();
}
void push(T&& item) {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
queue_.push(std::forward<T>(item));
mlock.unlock();
cond_.notify_one();
@@ -62,7 +63,7 @@ class ConcurrentQueue {
template <typename... Args>
void emplace(Args&&... args) {
std::unique_lock<std::mutex> mlock(mutex_);
std::unique_lock<wpi::mutex> mlock(mutex_);
queue_.emplace(std::forward<Args>(args)...);
mlock.unlock();
cond_.notify_one();
@@ -74,8 +75,8 @@ class ConcurrentQueue {
private:
std::queue<T> queue_;
mutable std::mutex mutex_;
std::condition_variable cond_;
mutable wpi::mutex mutex_;
wpi::condition_variable cond_;
};
} // namespace wpi