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

Remove priority mutex (#644)

Browse Source 
* 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:
Tyler Veness
2017-09-28 23:32:35 -07:00
committed by Peter Johnson
parent 19addb04cf
commit dd66b23845
44 changed files with 390 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibc/src/main/native/include/Resource.h
View File

@@ -10,11 +10,10 @@
#include <stdint.h>
#include <memory>
#include <mutex>
#include <string>
#include <vector>
#include <HAL/cpp/priority_mutex.h>
#include "ErrorBase.h"
namespace frc {
@@ -44,9 +43,9 @@ class Resource : public ErrorBase {
private:
std::vector<bool> m_isAllocated;
hal::priority_recursive_mutex m_allocateLock;
std::mutex m_allocateMutex;
static hal::priority_recursive_mutex m_createLock;
static std::mutex m_createMutex;
};
} // namespace frc