flow: Merged <feature> 'changesAfter3_0_2' to <develop> ('default').

arrayPerfTop/src/arrayPerformanceMain.cpp

@@ -83,7 +83,7 @@ int main(int argc,char *argv[])
     pvRecord = ArrayPerformance::create(recordName,size,delay);
     result = master->addRecord(pvRecord);
     PVRecordPtr arrayPreformance = pvRecord;
-    arrayPreformance->setTraceLevel(1);
+    arrayPreformance->setTraceLevel(0);
     pvRecord = TraceRecord::create("traceRecordPGRPC");
     result = master->addRecord(pvRecord);
     if(!result) cout<< "record " << recordName << " not added" << endl;

arrayPerfTop/src/longArrayGet.cpp

@@ -100,11 +100,14 @@ public:
             cout << requesterName << " message " << message << endl;
        }
     virtual void channelGetConnect(
+        Status const & status,
+        ChannelGet::shared_pointer const & channelGet,
+        StructureConstPtr const &structure);
+    virtual void getDone(
         Status const & status,
         ChannelGet::shared_pointer const & channelGet,
         PVStructurePtr const &pvStructure,
-        BitSetPtr const &bitSet);
-    virtual void getDone(Status const & status);
+        BitSetPtr const & bitSet);
 private:
     LongArrayChannelGetRequesterPtr getPtrSelf()
     {
@@ -155,9 +158,12 @@ public:
     virtual void channelGetConnect(
         Status const & status,
         ChannelGet::shared_pointer const & channelGet,
+        StructureConstPtr const &structure);
+    virtual void getDone(
+        Status const & status,
+        ChannelGet::shared_pointer channelGet,
         PVStructurePtr const &pvStructure,
-        BitSetPtr const &bitSet);
-    virtual void getDone(Status const & status);
+        BitSetPtr const & bitSet);
 private:
     LongArrayChannelGetPtr getPtrSelf()
     {
@@ -206,21 +212,24 @@ void LongArrayChannelRequester::channelStateChange(
 
 void LongArrayChannelGetRequester::channelGetConnect(
     Status const & status,
-    ChannelGet::shared_pointer const & channelGet,
-    PVStructurePtr const &pvStructure,
-    BitSetPtr const &bitSet)
+        ChannelGet::shared_pointer const & channelGet,
+        StructureConstPtr const &structure)
 {
     Lock guard(mutex);
     if(isDestroyed) return;
     longArrayChannelGet->channelGetConnect(
-        status,channelGet,pvStructure,bitSet);
+        status,channelGet,structure);
 }
 
-void LongArrayChannelGetRequester::getDone(Status const & status)
+void LongArrayChannelGetRequester::getDone(
+        Status const & status,
+        ChannelGet::shared_pointer const & channelGet,
+        PVStructurePtr const &pvStructure,
+        BitSetPtr const & bitSet)
 {
     Lock guard(mutex);
     if(isDestroyed) return;
-    longArrayChannelGet->getDone(status);
+    longArrayChannelGet->getDone(status,channelGet,pvStructure,bitSet);
 }
 
 void LongArrayChannelGet::channelCreated(
@@ -241,12 +250,10 @@ void LongArrayChannelGet::channelStateChange(
        (connectionState==Channel::CONNECTED ? infoMessage : errorMessage);
    message("channelStateChange",messageType);
 }
-
 void LongArrayChannelGet::channelGetConnect(
         Status const & status,
         ChannelGet::shared_pointer const & channelGet,
-        PVStructurePtr const &pvStructure,
-        BitSetPtr const &bitSet)
+        StructureConstPtr const &structure)
 {
     this->status = status;
     if(!status.isOK())  {
@@ -255,9 +262,8 @@ void LongArrayChannelGet::channelGetConnect(
         return;
     }
     this->channelGet = channelGet;
-    this->pvStructure = pvStructure;
-    this->bitSet = bitSet;
     bool structureOK(true);
+    PVStructurePtr pvStructure = getPVDataCreate()->createPVStructure(structure);
     PVFieldPtr pvField = pvStructure->getSubField("timeStamp");
     if(pvField==NULL) structureOK = false;
     pvField = pvStructure->getSubField("value");
@@ -284,7 +290,7 @@ void LongArrayChannelGet::channelGetConnect(
 bool LongArrayChannelGet::init()
 {
     ChannelProvider::shared_pointer channelProvider =
-        getChannelAccess()->getProvider(providerName);
+        getChannelProviderRegistry()->getProvider(providerName);
     if(channelProvider==NULL) {
         cout << "provider " << providerName << " not found" << endl;
         return false;
@@ -355,7 +361,7 @@ void LongArrayChannelGet::run()
         int numChannelCreate = 0;
         size_t nElements = 0;
         while(true) {
-            channelGet->get(false);
+            channelGet->get();
             event.wait();
             if(isDestroyed) {
                 runReturned = true;
@@ -398,7 +404,7 @@ void LongArrayChannelGet::run()
                     longArrayChannelRequester->destroy();
                     channel->destroy();
                     ChannelProvider::shared_pointer channelProvider =
-                         getChannelAccess()->getProvider(providerName);
+                         getChannelProviderRegistry()->getProvider(providerName);
                     longArrayChannelRequester.reset(new LongArrayChannelRequester(getPtrSelf()));
                     channel = channelProvider->createChannel(
                          channelName,
@@ -445,10 +451,14 @@ void LongArrayChannelGet::run()
     }
 }
 
-
-
-void LongArrayChannelGet::getDone(Status const & status)
+void LongArrayChannelGet::getDone(
+        Status const & status,
+        ChannelGet::shared_pointer channelGet,
+        PVStructurePtr const &pvStructure,
+        BitSetPtr const & bitSet)
 {
+    this->pvStructure = pvStructure;
+    this->bitSet = bitSet;
     event.signal();
 }
 

arrayPerfTop/src/longArrayMonitor.cpp

@@ -269,7 +269,8 @@ bool LongArrayMonitor::init(
     channelRequester = LAMChannelRequesterPtr(new LAMChannelRequester(getPtrSelf()));
     monitorRequester = LAMMonitorRequesterPtr(new LAMMonitorRequester(getPtrSelf(),waitTime));
     monitorRequester->init();
-    ChannelProvider::shared_pointer channelProvider = getChannelAccess()->getProvider(providerName);
+    ChannelProvider::shared_pointer channelProvider =
+       getChannelProviderRegistry()->getProvider(providerName);
     if(channelProvider==NULL) {
         cout << "provider " << providerName << " not found" << endl;
         return false;

arrayPerfTop/src/longArrayPut.cpp

@@ -70,12 +70,17 @@ public:
         Channel::shared_pointer const & channel,
         Channel::ConnectionState connectionState);
     virtual void channelPutConnect(
+        Status const & status,
+        ChannelPut::shared_pointer const & channelPut,
+        StructureConstPtr const &structure);
+    virtual void putDone(
+        Status const & status,
+        ChannelPut::shared_pointer const & channelPut);
+    virtual void getDone(
         Status const & status,
         ChannelPut::shared_pointer const & channelPut,
         PVStructurePtr const &pvStructure,
-        BitSetPtr const &bitSet);
-    virtual void putDone(Status const & status);
-    virtual void getDone(Status const & status){}
+        BitSetPtr const & bitSet){}
 private:
     LongArrayChannelPutPtr getPtrSelf()
     {
@@ -103,7 +108,7 @@ private:
 
 bool LongArrayChannelPut::init()
 {
-    ChannelProvider::shared_pointer channelProvider = getChannelAccess()->getProvider(providerName);
+    ChannelProvider::shared_pointer channelProvider = getChannelProviderRegistry()->getProvider(providerName);
     if(channelProvider==NULL) {
         cout << "provider " << providerName << " not found" << endl;
         return false;
@@ -168,8 +173,7 @@ void LongArrayChannelPut::channelStateChange(
 void LongArrayChannelPut::channelPutConnect(
         Status const & status,
         ChannelPut::shared_pointer const & channelPut,
-        PVStructurePtr const &pvStructure,
-        BitSetPtr const &bitSet)
+        StructureConstPtr const &structure)
 {
     this->status = status;
     if(!status.isOK())  {
@@ -178,8 +182,8 @@ void LongArrayChannelPut::channelPutConnect(
         return;
     }
     this->channelPut = channelPut;
-    this->pvStructure = pvStructure;
-    this->bitSet = bitSet;
+    pvStructure = getPVDataCreate()->createPVStructure(structure);
+    bitSet = BitSetPtr(new BitSet(pvStructure->getNumberFields()));
     bool structureOK(true);
     PVFieldPtr pvField = pvStructure->getSubField("value");
     if(pvField==NULL) {
@@ -222,7 +226,7 @@ void LongArrayChannelPut::run()
             shared_vector<const int64> data(freeze(xxx));
             pvLongArray->replace(data);
             bitSet->set(pvLongArray->getFieldOffset());
-            channelPut->put(false);
+            channelPut->put(pvStructure,bitSet);
             event.wait();
             if(isDestroyed) {
                 runReturned = true;
@@ -264,7 +268,7 @@ void LongArrayChannelPut::run()
                     channel->destroy();
                     epicsThreadSleep(1.0);
                     ChannelProvider::shared_pointer channelProvider =
-                         getChannelAccess()->getProvider(providerName);
+                         getChannelProviderRegistry()->getProvider(providerName);
                     channel = channelProvider->createChannel(
                         channelName,getPtrSelf(),0);
                     event.wait();
@@ -310,7 +314,9 @@ void LongArrayChannelPut::run()
     }
 }
 
-void LongArrayChannelPut::putDone(Status const & status)
+void LongArrayChannelPut::putDone(
+        Status const & status,
+        ChannelPut::shared_pointer const & channelPut)
 {
     event.signal();
 }