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

NetworkTable: Protect listeners with mutex.

Browse Source
This commit is contained in:
Peter Johnson
2015-08-27 23:39:52 -07:00
parent 6c8a5935c9
commit 6e4d7ca933
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/networktables/NetworkTable.h
View File

@@ -1,6 +1,7 @@
#ifndef _NETWORKTABLE_H_
#define _NETWORKTABLE_H_
#include <mutex>
#include <vector>
#include "tables/ITable.h"
@@ -10,6 +11,7 @@ class NetworkTable : public ITable {
struct private_init {};
std::string m_path;
std::mutex m_mutex;
typedef std::pair<ITableListener*, unsigned int> Listener;
std::vector<Listener> m_listeners;

3
src/networktables/NetworkTable.cpp
View File

@@ -65,6 +65,7 @@ void NetworkTable::AddTableListener(ITableListener* listener) {
void NetworkTable::AddTableListener(ITableListener* listener,
bool immediateNotify) {
std::lock_guard<std::mutex> lock(m_mutex);
llvm::SmallString<128> path(m_path);
path += PATH_SEPARATOR_CHAR;
std::size_t prefix_len = path.size();
@@ -83,6 +84,7 @@ void NetworkTable::AddTableListener(ITableListener* listener,
void NetworkTable::AddTableListener(StringRef key,
ITableListener* listener,
bool immediateNotify) {
std::lock_guard<std::mutex> lock(m_mutex);
llvm::SmallString<128> path(m_path);
path += PATH_SEPARATOR_CHAR;
std::size_t prefix_len = path.size();
@@ -99,6 +101,7 @@ void NetworkTable::AddTableListener(StringRef key,
}
void NetworkTable::RemoveTableListener(ITableListener* listener) {
std::lock_guard<std::mutex> lock(m_mutex);
auto matches_begin =
std::remove_if(m_listeners.begin(), m_listeners.end(),
[=](const Listener& x) { return x.first == listener; });