Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-16 01:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDK: Fix data races on the local semaphores

Browse Source
This commit is contained in:
Dennis Klein
2019-09-01 15:44:52 +02:00
committed by Dennis Klein
parent 5d6184cd1a
commit 1c49dde668
5 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fairmq/tools/Semaphore.cxx
View File

@@ -39,7 +39,7 @@ auto Semaphore::Signal() -> void
fCv.notify_one();
}
auto Semaphore::GetCount() -> std::size_t
auto Semaphore::GetCount() const -> std::size_t
{
std::unique_lock<std::mutex> lk(fMutex);
return fCount;
@@ -63,7 +63,7 @@ auto SharedSemaphore::Signal() -> void
fSemaphore->Signal();
}
auto SharedSemaphore::GetCount() -> std::size_t
auto SharedSemaphore::GetCount() const -> std::size_t
{
return fSemaphore->GetCount();
}

6
fairmq/tools/Semaphore.h
View File

@@ -30,11 +30,11 @@ struct Semaphore
auto Wait() -> void;
auto Signal() -> void;
auto GetCount() -> std::size_t;
auto GetCount() const -> std::size_t;
private:
std::size_t fCount;
std::mutex fMutex;
mutable std::mutex fMutex;
std::condition_variable fCv;
};
@@ -49,7 +49,7 @@ struct SharedSemaphore
auto Wait() -> void;
auto Signal() -> void;
auto GetCount() -> std::size_t;
auto GetCount() const -> std::size_t;
private:
std::shared_ptr<Semaphore> fSemaphore;