mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-27 02:01:42 +00:00
Remove priority mutex (#644)
* Removed hal::priority_condition_variable * Replaced uses of priority mutexes with std::mutex and std::recursive_mutex This allowed replacing a use of std::condition_variable_any with std::condition_variable. * Replaced all uses of std::recursive_mutex with std::mutex equivalents
This commit is contained in:
committed by
Peter Johnson
parent
19addb04cf
commit
dd66b23845
@@ -11,10 +11,10 @@
|
||||
|
||||
#include <atomic>
|
||||
#include <functional>
|
||||
#include <mutex>
|
||||
#include <utility>
|
||||
|
||||
#include <HAL/Notifier.h>
|
||||
#include <HAL/cpp/priority_mutex.h>
|
||||
|
||||
#include "ErrorBase.h"
|
||||
|
||||
@@ -47,9 +47,9 @@ class Notifier : public ErrorBase {
|
||||
static void Notify(uint64_t currentTimeInt, HAL_NotifierHandle handle);
|
||||
|
||||
// used to constrain execution between destructors and callback
|
||||
static hal::priority_mutex m_destructorMutex;
|
||||
static std::mutex m_destructorMutex;
|
||||
// held while updating process information
|
||||
hal::priority_mutex m_processMutex;
|
||||
std::mutex m_processMutex;
|
||||
// HAL handle, atomic for proper destruction
|
||||
std::atomic<HAL_NotifierHandle> m_notifier{0};
|
||||
// address of the handler
|
||||
|
||||
Reference in New Issue
Block a user