sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Lock before adding or removing message callbacks

checksum-failure-logging
Paul Hollinsky 2019-06-13 15:47:23 -04:00
parent 4530bd14c0
commit b7dbeccaef
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
communication/communication.cpp
View File

@ -91,11 +91,13 @@ std::shared_ptr<SerialNumberMessage> Communication::getSerialNumberSync(std::chr
} }
int Communication::addMessageCallback(const MessageCallback& cb) { int Communication::addMessageCallback(const MessageCallback& cb) {
std::lock_guard<std::mutex> lk(messageCallbacksLock);
messageCallbacks.insert(std::make_pair(messageCallbackIDCounter, cb)); messageCallbacks.insert(std::make_pair(messageCallbackIDCounter, cb));
return messageCallbackIDCounter++; return messageCallbackIDCounter++;
} }
bool Communication::removeMessageCallback(int id) { bool Communication::removeMessageCallback(int id) {
std::lock_guard<std::mutex> lk(messageCallbacksLock);
try { try {
messageCallbacks.erase(id); messageCallbacks.erase(id);
return true; return true;
@ -140,7 +142,8 @@ void Communication::readTask() {
err(APIError::Unknown); // TODO Use specific error err(APIError::Unknown); // TODO Use specific error
continue; continue;
} }
std::lock_guard<std::mutex> lk(messageCallbacksLock);
for(auto& cb : messageCallbacks) { for(auto& cb : messageCallbacks) {
if(!closing) { // We might have closed while reading or processing if(!closing) { // We might have closed while reading or processing
cb.second.callIfMatch(msg); cb.second.callIfMatch(msg);

1
include/icsneo/communication/communication.h
View File

@ -57,6 +57,7 @@ public:
protected: protected:
std::unique_ptr<ICommunication> impl; std::unique_ptr<ICommunication> impl;
static int messageCallbackIDCounter; static int messageCallbackIDCounter;
std::mutex messageCallbacksLock;
std::map<int, MessageCallback> messageCallbacks; std::map<int, MessageCallback> messageCallbacks;
std::atomic<bool> closing{false}; std::atomic<bool> closing{false};