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

Adds a static mutex to notifiers to stop destructor race condition (#204)

Browse Source
This commit is contained in:
Thad House
2016-08-15 19:56:32 -07:00
committed by Peter Johnson
parent 776cb915bc
commit 40365faeda
7 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibj/src/athena/cpp/lib/NotifierJNI.cpp
View File

@@ -106,8 +106,11 @@ void NotifierThreadJNI::Main() {
jvm->DetachCurrentThread();
}
void notifierHandler(uint64_t currentTimeInt, void *param) {
((NotifierJNI *)param)->Notify(currentTimeInt);
void notifierHandler(uint64_t currentTimeInt, HAL_NotifierHandle handle) {
int32_t status = 0;
auto param = HAL_GetNotifierParam(handle, &status);
if (param == nullptr) return;
(static_cast<NotifierJNI*>(param))->Notify(currentTimeInt);
}
extern "C" {