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

allow writing pvCopy plugins for the master field

Browse Source
This commit is contained in:
Sinisa Veseli
2021-11-30 08:54:57 -06:00
parent 0cf706511e
commit 9dfebf1897
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/copy/pvCopy.cpp
View File

@ -88,7 +88,6 @@ PVCopyPtr PVCopy::create(
bool result = pvCopy->init(pvStructure); bool result = pvCopy->init(pvStructure);
if(!result) return PVCopyPtr(); if(!result) return PVCopyPtr();
pvCopy->traverseMasterInitPlugin(); pvCopy->traverseMasterInitPlugin();
//cout << pvCopy->dump() << endl;
return pvCopy; return pvCopy;
} }
@ -433,10 +432,19 @@ bool PVCopy::init(epics::pvData::PVStructurePtr const &pvRequest)
PVStructurePtr pvMasterStructure = pvMaster; PVStructurePtr pvMasterStructure = pvMaster;
size_t len = pvRequest->getPVFields().size(); size_t len = pvRequest->getPVFields().size();
bool entireMaster = false; bool entireMaster = false;
if(len==0) entireMaster = true;
PVStructurePtr pvOptions; PVStructurePtr pvOptions;
if(len==1) { if(len==0) {
pvOptions = pvRequest->getSubField<PVStructure>("_options"); entireMaster = true;
}
else {
// If masterField is in the request, but not in the master structure,
// then assume entire master is requested
PVStructurePtr masterFieldPtr = pvMaster->getSubField<PVStructure>("masterField");
PVStructurePtr requestFieldPtr = pvRequest->getSubField<PVStructure>("masterField");
if (!masterFieldPtr && requestFieldPtr) {
entireMaster = true;
pvOptions = requestFieldPtr->getSubField<PVStructure>("_options");
}
} }
if(entireMaster) { if(entireMaster) {
structure = pvMasterStructure->getStructure(); structure = pvMasterStructure->getStructure();

5
src/database/pvRecord.cpp
View File

@ -418,7 +418,10 @@ void PVRecordField::postParent(PVRecordFieldPtr const & subField)
listener->dataPut(pvrs,subField); listener->dataPut(pvrs,subField);
} }
PVRecordStructurePtr parent(this->parent.lock()); PVRecordStructurePtr parent(this->parent.lock());
if(parent) parent->postParent(subField); if(parent) {
parent->postParent(subField);
parent->callListener();
}
} }
void PVRecordField::postSubField() void PVRecordField::postSubField()