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

more lastelem

Browse Source
This commit is contained in:
Michael Davidsaver
2016-02-06 22:21:06 -05:00
parent 64b2868521
commit ceefb62cff
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
p2pApp/moncache.cpp
View File

@ -137,6 +137,7 @@ MonitorCacheEntry::monitorEvent(pvd::MonitorPtr const & monitor)
*lastelem->changedBitSet = *update->changedBitSet;
*lastelem->overrunBitSet = *update->overrunBitSet;
monitor->release(update);
update.reset();
interested_t::iterator IIT(interested); // recursively locks interested.mutex() (assumes this->mutex() is interestd.mutex())
for(interested_t::value_pointer pusr = IIT.next(); pusr; pusr = IIT.next())
@ -150,9 +151,10 @@ MonitorCacheEntry::monitorEvent(pvd::MonitorPtr const & monitor)
if(!usr->running || usr->empty.empty()) {
usr->inoverflow = true;
*usr->overflowElement->overrunBitSet |= *lastelem->overrunBitSet;
usr->overflowElement->overrunBitSet->or_and(*usr->overflowElement->changedBitSet,
*update->changedBitSet);
assign(usr->overflowElement, update);
*lastelem->changedBitSet);
assign(usr->overflowElement, lastelem);
epicsAtomicIncrSizeT(&usr->ndropped);
continue;
@ -167,8 +169,8 @@ MonitorCacheEntry::monitorEvent(pvd::MonitorPtr const & monitor)
AUTO_VAL(elem, usr->empty.front());
*elem->overrunBitSet = *update->overrunBitSet;
assign(elem, update); // TODO: nice to avoid copy
*elem->overrunBitSet = *lastelem->overrunBitSet;
assign(elem, lastelem); // TODO: nice to avoid copy
usr->filled.push_back(elem);
usr->empty.pop_front();