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

more monitor delta handling

Browse Source
This commit is contained in:
Michael Davidsaver
2016-02-17 12:50:28 -05:00
parent 8aa99160e2
commit e35f06cb00
6 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
p2pApp/chancache.h
View File

@ -40,6 +40,9 @@ struct MonitorCacheEntry : public epics::pvData::MonitorRequester
size_t nevents; // # of upstream events poll()'d
epics::pvData::StructureConstPtr typedesc;
/** value of upstream monitor (accumulation of all deltas)
* changed/overflow bit masks of last delta
*/
epics::pvData::MonitorElement::shared_pointer lastelem;
epics::pvData::MonitorPtr mon;
epics::pvData::Status startresult;

25
p2pApp/moncache.cpp
View File

@ -12,14 +12,6 @@ size_t MonitorCacheEntry::num_instances;
size_t MonitorUser::num_instances;
namespace {
void assign(pvd::MonitorElementPtr& to, const pvd::MonitorElementPtr& from)
{
assert(to && from);
// TODO: lot of copying happens here. how expensive?
*to->changedBitSet = *from->changedBitSet;
to->pvStructurePtr->copyUnchecked(*from->pvStructurePtr);
}
// fetch scalar value or default
template<typename T>
T getS(const pvd::PVStructurePtr& s, const char* name, T dft)
@ -148,13 +140,22 @@ MonitorCacheEntry::monitorEvent(pvd::MonitorPtr const & monitor)
Guard G(usr->mutex());
if(usr->initial)
continue; // no start() yet
// TODO: track overflow when !running (after stop())?
if(!usr->running || usr->empty.empty()) {
usr->inoverflow = true;
/* overrun |= lastelem->overrun // upstream overflows
* overrun |= changed & lastelem->changed // downstream overflows
* changed |= lastelem->changed // accumulate changes
*/
*usr->overflowElement->overrunBitSet |= *lastelem->overrunBitSet;
usr->overflowElement->overrunBitSet->or_and(*usr->overflowElement->changedBitSet,
*lastelem->changedBitSet);
assign(usr->overflowElement, lastelem);
*usr->overflowElement->changedBitSet |= *lastelem->changedBitSet;
usr->overflowElement->pvStructurePtr->copyUnchecked(*lastelem->pvStructurePtr,
*lastelem->changedBitSet);
epicsAtomicIncrSizeT(&usr->ndropped);
continue;
@ -170,7 +171,10 @@ MonitorCacheEntry::monitorEvent(pvd::MonitorPtr const & monitor)
AUTO_VAL(elem, usr->empty.front());
*elem->overrunBitSet = *lastelem->overrunBitSet;
assign(elem, lastelem); // TODO: nice to avoid copy
*elem->changedBitSet = *lastelem->changedBitSet;
// Note: can't use changed mask to optimize this copy since we don't know
// the state of the free element
elem->pvStructurePtr->copyUnchecked(*lastelem->pvStructurePtr);
usr->filled.push_back(elem);
usr->empty.pop_front();
@ -297,6 +301,7 @@ MonitorUser::start()
pvd::MonitorElementPtr elem(empty.front());
elem->pvStructurePtr = lval;
elem->changedBitSet->set(0); // indicate all changed
elem->overrunBitSet->clear();
filled.push_back(elem);
empty.pop_front();
}