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

Rename Notifier::m_handlerMutex to Notifier::m_notifyMutex (#105)

Browse Source 
A month ago, we discussed renaming this mutex to better reflect its current use, and this commit does that. The inline comment was also updated.
This commit is contained in:
Tyler Veness
2016-06-18 02:20:29 -07:00
committed by Peter Johnson
parent 3cacc2aba6
commit ecc210f99a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wpilibc/athena/src/Notifier.cpp
View File

@@ -39,7 +39,7 @@ Notifier::~Notifier() {
/* Acquire the mutex; this makes certain that the handler is not being
* executed by the interrupt manager.
*/
std::lock_guard<priority_mutex> lock(m_handlerMutex);
std::lock_guard<priority_mutex> lock(m_notifyMutex);
}
/**
@@ -66,11 +66,11 @@ void Notifier::Notify(uint64_t currentTimeInt, void* param) {
auto handler = notifier->m_handler;
notifier->m_handlerMutex.lock();
notifier->m_notifyMutex.lock();
notifier->m_processMutex.unlock();
if (handler) handler();
notifier->m_handlerMutex.unlock();
notifier->m_notifyMutex.unlock();
}
/**
@@ -122,5 +122,5 @@ void Notifier::Stop() {
// Wait for a currently executing handler to complete before returning from
// Stop()
std::lock_guard<priority_mutex> sync(m_handlerMutex);
std::lock_guard<priority_mutex> sync(m_notifyMutex);
}