Merge pull request #55 from epics-base/arrayfilterforunion

Arrayfilterforunion

src/copy/pvArrayPlugin.cpp

@@ -76,9 +76,19 @@ static vector<string> split(string const & colonSeparatedList) {
 
 PVArrayFilterPtr PVArrayFilter::create(
      const std::string & requestValue,
-     const PVFieldPtr & master)
+     const PVFieldPtr & masterField)
 {
-    Type type = master->getField()->getType();
+    bool masterIsUnion = false;
+    PVUnionPtr pvUnion;
+    Type type = masterField->getField()->getType();
+    if(type==epics::pvData::union_) {
+        pvUnion = std::tr1::static_pointer_cast<PVUnion>(masterField);
+        PVFieldPtr pvField = pvUnion->get();
+        if(pvField) {
+            masterIsUnion = true;
+            type = pvField->getField()->getType();
+        }
+    }
     if(type!=scalarArray) {
         PVArrayFilterPtr filter = PVArrayFilterPtr();
         return filter;
@@ -112,25 +122,47 @@ PVArrayFilterPtr PVArrayFilter::create(
         PVArrayFilterPtr filter = PVArrayFilterPtr();
         return filter;
     }
+    PVScalarArrayPtr masterArray;
+    if(masterIsUnion) {
+        masterArray = static_pointer_cast<PVScalarArray>(pvUnion->get());
+    } else {
+        masterArray = static_pointer_cast<PVScalarArray>(masterField);
+    }
     PVArrayFilterPtr filter =
          PVArrayFilterPtr(
-             new PVArrayFilter(
+             new PVArrayFilter(start,increment,end,masterField,masterArray)); 
-                 start,increment,end,static_pointer_cast<PVScalarArray>(master))); 
     return filter;
 }
 
-PVArrayFilter::PVArrayFilter(long start,long increment,long end,const PVScalarArrayPtr & masterArray)
+PVArrayFilter::PVArrayFilter(
+    long start,long increment,long end,
+    const PVFieldPtr & masterField,
+    const epics::pvData::PVScalarArrayPtr masterArray)
 : start(start),
   increment(increment),
   end(end),
+  masterField(masterField),
   masterArray(masterArray)
 {
 }
 
 
-bool PVArrayFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bool toCopy)
+bool PVArrayFilter::filter(const PVFieldPtr & pvField,const BitSetPtr & bitSet,bool toCopy)
 {
-    PVScalarArrayPtr copyArray = static_pointer_cast<PVScalarArray>(pvCopy);
+    PVFieldPtr pvCopy = pvField;
+    PVScalarArrayPtr copyArray;
+    bool isUnion = false;
+    Type type = masterField->getField()->getType();
+    if(type==epics::pvData::union_) {
+        isUnion = true;
+        PVUnionPtr pvMasterUnion = std::tr1::static_pointer_cast<PVUnion>(masterField);
+        PVUnionPtr pvCopyUnion = std::tr1::static_pointer_cast<PVUnion>(pvCopy);
+        if(toCopy) pvCopyUnion->copy(*pvMasterUnion);
+        PVFieldPtr pvField = pvCopyUnion->get();
+        copyArray = static_pointer_cast<PVScalarArray>(pvField);
+    } else {
+       copyArray = static_pointer_cast<PVScalarArray>(pvCopy);
+    }
     long len = 0;
     long start = this->start;
     long end = this->end;
@@ -144,7 +176,7 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bo
     	if (end < 0) end = 0;
 
     }
-    if(toCopy) {	
+    if(toCopy) {
     	if (end >= no_elements) end = no_elements - 1;
     	if (end - start >= 0) len = 1 + (end - start) / increment;
     	if(len<=0 || start>=no_elements) {
@@ -164,7 +196,7 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bo
     	    }
     	}
     	copyArray->setLength(len);
-    	bitSet->set(pvCopy->getFieldOffset());
+        bitSet->set(pvField->getFieldOffset());
     	return true;
     }
     if (end - start >= 0) len = 1 + (end - start) / increment;
@@ -181,6 +213,7 @@ bool PVArrayFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bo
     	     indto += increment;
     	}
     }
+    if(isUnion) masterField->postPut();
     return true;
 }
 

src/pv/pvArrayPlugin.h

@@ -63,9 +63,13 @@ private:
     long start;
     long increment;
     long end;
+    epics::pvData::PVFieldPtr masterField;
     epics::pvData::PVScalarArrayPtr masterArray;
 
-    PVArrayFilter(long start,long increment,long end,const epics::pvData::PVScalarArrayPtr & masterArray);
+    PVArrayFilter(
+        long start,long increment,long end,
+        const epics::pvData::PVFieldPtr & masterField,
+        const epics::pvData::PVScalarArrayPtr masterArray);
 public:
     POINTER_DEFINITIONS(PVArrayFilter);
     virtual ~PVArrayFilter();

src/pvAccess/monitorFactory.cpp

@@ -291,7 +291,7 @@ void MonitorLocal::dataPut(PVRecordFieldPtr const & pvRecordField)
 {
     if(pvRecord->getTraceLevel()>1)
     {
-        cout << "PVCopyMonitor::dataPut(pvRecordField)" << endl;
+        cout << "MonitorLocal::dataPut(pvRecordField)" << endl;
     }
     if(state!=active) return;
     {
@@ -316,7 +316,7 @@ void MonitorLocal::dataPut(
 {
     if(pvRecord->getTraceLevel()>1)
     {
-        cout << "PVCopyMonitor::dataPut(requested,pvRecordField)" << endl;
+        cout << "MonitorLocal::dataPut(requested,pvRecordField)" << endl;
     }
     if(state!=active) return;
     {
@@ -343,7 +343,7 @@ void MonitorLocal::beginGroupPut(PVRecordPtr const & pvRecord)
 {
     if(pvRecord->getTraceLevel()>1)
     {
-        cout << "PVCopyMonitor::beginGroupPut()" << endl;
+        cout << "MonitorLocal::beginGroupPut()" << endl;
     }
     if(state!=active) return;
     {
@@ -357,7 +357,7 @@ void MonitorLocal::endGroupPut(PVRecordPtr const & pvRecord)
 {
     if(pvRecord->getTraceLevel()>1)
     {
-        cout << "PVCopyMonitor::endGroupPut dataChanged " << dataChanged << endl;
+        cout << "MonitorLocal::endGroupPut dataChanged " << dataChanged << endl;
     }
     if(state!=active) return;
     {
@@ -374,7 +374,7 @@ void MonitorLocal::unlisten(PVRecordPtr const & pvRecord)
 {
     if(pvRecord->getTraceLevel()>1)
     {
-        cout << "PVCopyMonitor::unlisten\n";
+        cout << "MonitorLocal::unlisten\n";
     }
     {
         Lock xx(mutex);
@@ -384,7 +384,7 @@ void MonitorLocal::unlisten(PVRecordPtr const & pvRecord)
     if(requester) {
         if(pvRecord->getTraceLevel()>1)
         {
-            cout << "PVCopyMonitor::unlisten calling requester->unlisten\n";
+            cout << "MonitorLocal::unlisten calling requester->unlisten\n";
         }
         requester->unlisten(getPtrSelf());
     }

test/src/testPlugin.cpp

@@ -145,6 +145,73 @@ static void arrayTest()
     testOk1(nset==1);
 }
 
+static void unionArrayTest()
+{
+    if(debug) {cout << endl << endl << "****unionArrayTest****" << endl;}
+    bool result = false;
+    uint32 nset = 0;
+    size_t n = 10;
+    shared_vector<double> values(n);
+    for(size_t i=0; i<n; i++) values[i] = i + .06;
+    PVDoubleArrayPtr pvDoubleArray = 
+        static_pointer_cast<PVDoubleArray>(PVDataCreate::getPVDataCreate()->createPVScalarArray(pvDouble));
+    const shared_vector<const double> yyy(freeze(values));
+    pvDoubleArray->putFrom(yyy);
+
+    StandardFieldPtr standardField = getStandardField();
+    FieldCreatePtr fieldCreate = getFieldCreate();
+    StructureConstPtr top = fieldCreate->createFieldBuilder()->
+        add("value",fieldCreate->createVariantUnion()) ->
+        add("timeStamp", standardField->timeStamp()) ->
+        addNestedStructure("subfield") ->
+           add("value",fieldCreate->createVariantUnion()) ->
+           endNested()->
+        createStructure();
+    PVStructurePtr pvRecordStructure(PVDataCreate::getPVDataCreate()->createPVStructure(top));
+    PVRecordPtr pvRecord(PVRecord::create("unionArrayRecord",pvRecordStructure));
+    PVUnionPtr pvUnion = pvRecord->getPVStructure()->getSubField<PVUnion>("value");
+    pvUnion->set(pvDoubleArray);
+    pvUnion = pvRecord->getPVStructure()->getSubField<PVUnion>("subfield.value");
+    pvUnion->set(pvDoubleArray);
+    if(debug) { cout << "initial\n" << pvRecordStructure << "\n";}
+
+    PVStructurePtr pvRequest(CreateRequest::create()->createRequest("value[array=1:3]"));
+    PVCopyPtr pvCopy(PVCopy::create(pvRecordStructure,pvRequest,""));
+    PVStructurePtr pvStructureCopy(pvCopy->createPVStructure());
+    BitSetPtr bitSet(new BitSet(pvStructureCopy->getNumberFields()));
+    PVDoubleArrayPtr pvValue(pvRecordStructure->getSubField<PVDoubleArray>("value"));
+    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
+    nset = bitSet->cardinality();
+    if(debug) {
+        cout << "after get value"
+             << " result " << (result ? "true" : "false")
+             << " nset " << nset
+             << " bitSet " << *bitSet
+             << " pvStructureCopy\n" << pvStructureCopy
+             << "\n";
+    }
+    testOk1(result==true);
+    testOk1(nset==1);
+
+    pvRequest = CreateRequest::create()->createRequest("subfield.value[array=1:3]");
+    pvCopy = PVCopy::create(pvRecordStructure,pvRequest,"");
+    pvStructureCopy = pvCopy->createPVStructure();
+    bitSet = BitSetPtr(new BitSet(pvStructureCopy->getNumberFields()));
+    pvValue = pvRecordStructure->getSubField<PVDoubleArray>("subfield.value");
+    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
+    nset = bitSet->cardinality();
+    if(debug) {
+        cout << "after get subfield.value"
+             << " result " << (result ? "true" : "false")
+             << " nset " << nset
+             << " bitSet " << *bitSet
+             << " pvStructureCopy\n" << pvStructureCopy
+             << "\n";
+    }
+    testOk1(result==true);
+    testOk1(nset==1);
+}
+
 static void timeStampTest()
 {
     if(debug) {cout << endl << endl << "****timeStampTest****" << endl;}
@@ -267,10 +334,11 @@ static void ignoreTest()
 
 MAIN(testPlugin)
 {
-    testPlan(22);
+    testPlan(26);
     PVDatabasePtr pvDatabase(PVDatabase::getMaster());
     deadbandTest();
     arrayTest();
+    unionArrayTest();
     timeStampTest();
     ignoreTest();
     return 0;