epics/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

eliminate seperate mutex for BaseMonitor

Browse Source
This commit is contained in:
Michael Davidsaver
2018-02-06 17:47:51 -08:00
parent 6e77fc85b6
commit 1635e75c86
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/pvahelper.h
View File

@ -74,7 +74,7 @@ struct BaseMonitor : public epics::pvAccess::Monitor
typedef epics::pvAccess::MonitorRequester requester_t;
mutable epicsMutex lock; // not held during any callback
epicsMutex& lock; // not held during any callback
typedef epicsGuard<epicsMutex> guard_t;
private:
@ -90,9 +90,11 @@ private:
buffer_t inuse, empty;
public:
BaseMonitor(const requester_t::weak_pointer& requester,
BaseMonitor(epicsMutex& lock,
const requester_t::weak_pointer& requester,
const epics::pvData::PVStructure::shared_pointer& pvReq)
:requester(requester)
:lock(lock)
,requester(requester)
,inoverflow(false)
,running(false)
,nbuffers(2)