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

avoid potential data races

Browse Source
This commit is contained in:
Michael Davidsaver
2015-12-08 21:00:16 -05:00
parent a2cbc6cae4
commit 41491d00bf
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
p2pApp/moncache.cpp
View File

@ -35,7 +35,6 @@ MonitorCacheEntry::monitorConnect(pvd::Status const & status,
pvd::MonitorPtr const & monitor,
pvd::StructureConstPtr const & structure)
{
assert(monitor==mon);
interested_t::vector_type tonotify;
{
@ -97,7 +96,10 @@ MonitorCacheEntry::monitorEvent(pvd::MonitorPtr const & monitor)
while((update=monitor->poll()))
{
cntpoll++;
lastval = update->pvStructurePtr;
{
Guard G(mutex());
lastval = update->pvStructurePtr;
}
epicsAtomicIncrSizeT(&nevents);
AUTO_VAL(tonotify, interested.lock_vector()); // TODO: avoid copy, iterate w/ lock