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

artf4156: Replaced synchronization primitives with C++11 equivalents

Browse Source 
Change-Id: I90da739347e875efda2a29dd5484b6dda3cd4753
This commit is contained in:
Tyler Veness
2015-06-25 01:54:20 -07:00
committed by James Kuszmaul
parent 7f5ee01d3e
commit 3f59f3472a
61 changed files with 1293 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wpilibc/wpilibC++/src/Resource.cpp
View File

@@ -9,7 +9,7 @@
#include "WPIErrors.h"
#include "ErrorBase.h"
ReentrantSemaphore Resource::m_createLock;
priority_recursive_mutex Resource::m_createLock;
/**
* Allocate storage for a new instance of Resource.
@@ -19,7 +19,7 @@ ReentrantSemaphore Resource::m_createLock;
* 1].
*/
Resource::Resource(uint32_t elements) {
Synchronized sync(m_createLock);
std::unique_lock<priority_recursive_mutex> sync(m_createLock);
m_size = elements;
m_isAllocated = new bool[m_size];
for (uint32_t i = 0; i < m_size; i++) {
@@ -39,7 +39,7 @@ Resource::Resource(uint32_t elements) {
*/
/*static*/ void Resource::CreateResourceObject(Resource **r,
uint32_t elements) {
Synchronized sync(m_createLock);
std::unique_lock<priority_recursive_mutex> sync(m_createLock);
if (*r == nullptr) {
*r = new Resource(elements);
}
@@ -59,7 +59,7 @@ Resource::~Resource() { delete[] m_isAllocated; }
* within the range is located and returned after it is marked allocated.
*/
uint32_t Resource::Allocate(const char *resourceDesc) {
Synchronized sync(m_allocateLock);
std::unique_lock<priority_recursive_mutex> sync(m_allocateLock);
for (uint32_t i = 0; i < m_size; i++) {
if (!m_isAllocated[i]) {
m_isAllocated[i] = true;
@@ -77,7 +77,7 @@ uint32_t Resource::Allocate(const char *resourceDesc) {
* unallocated, then returned.
*/
uint32_t Resource::Allocate(uint32_t index, const char *resourceDesc) {
Synchronized sync(m_allocateLock);
std::unique_lock<priority_recursive_mutex> sync(m_allocateLock);
if (index >= m_size) {
wpi_setWPIErrorWithContext(ChannelIndexOutOfRange, resourceDesc);
return ~0ul;
@@ -98,7 +98,7 @@ uint32_t Resource::Allocate(uint32_t index, const char *resourceDesc) {
* else in the program.
*/
void Resource::Free(uint32_t index) {
Synchronized sync(m_allocateLock);
std::unique_lock<priority_recursive_mutex> sync(m_allocateLock);
if (index == ~0ul) return;
if (index >= m_size) {
wpi_setWPIError(NotAllocated);