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

[sim] Make extension registry thread-safe

Browse Source
This commit is contained in:
Peter Johnson
2020-09-04 08:58:24 -07:00
parent 883d962838
commit 0365557b25
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hal/src/main/native/sim/Extensions.cpp
View File

@@ -12,7 +12,9 @@
#include <wpi/Path.h>
#include <wpi/SmallString.h>
#include <wpi/StringRef.h>
#include <wpi/mutex.h>
#include <wpi/raw_ostream.h>
#include <wpi/spinlock.h>
#include "hal/HAL.h"
@@ -39,6 +41,7 @@
#define DLERROR dlerror()
#endif
static wpi::recursive_spinlock gExtensionRegistryMutex;
static std::vector<std::pair<const char*, void*>> gExtensionRegistry;
static std::vector<std::pair<void*, void (*)(void*, const char*, void*)>>
gExtensionListeners;
@@ -123,6 +126,7 @@ int HAL_LoadExtensions(void) {
}
void HAL_RegisterExtension(const char* name, void* data) {
std::scoped_lock lock(gExtensionRegistryMutex);
gExtensionRegistry.emplace_back(name, data);
for (auto&& listener : gExtensionListeners)
listener.second(listener.first, name, data);
@@ -131,6 +135,7 @@ void HAL_RegisterExtension(const char* name, void* data) {
void HAL_RegisterExtensionListener(void* param,
void (*func)(void*, const char* name,
void* data)) {
std::scoped_lock lock(gExtensionRegistryMutex);
gExtensionListeners.emplace_back(param, func);
for (auto&& extension : gExtensionRegistry)
func(param, extension.first, extension.second);