From 9a77eb328ff7e8951d75f8230bd862a74b057c05 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 10 Jul 2017 14:39:23 +0200
Subject: [PATCH] pvaTestClient: put bitset

---
 examples/putme.cpp               | 22 ++++++++++++++++++----
 src/testing/pv/pvaTestClient.h   |  7 ++++++-
 src/testing/pvaTestClientGet.cpp | 13 ++++++++-----
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/examples/putme.cpp b/examples/putme.cpp
index 5ec23ee..c691521 100644
--- a/examples/putme.cpp
+++ b/examples/putme.cpp
@@ -66,19 +66,33 @@ struct PutTracker : public TestClientChannel::PutCallback
         op.cancel();
     }
 
-    virtual pvd::PVStructure::const_shared_pointer putBuild(const epics::pvData::StructureConstPtr &build)
+    virtual void putBuild(const epics::pvData::StructureConstPtr &build, TestClientChannel::PutCallback::Args& args) OVERRIDE FINAL
     {
+        // At this point we have the user provided value string 'value'
+        // and the server provided structure (with types).
+
+        // note: an exception thrown here will result in putDone() w/ Fail
+
+        // allocate a new structure instance.
+        // we are one-shot so don't bother to re-use
         pvd::PVStructurePtr root(pvd::getPVDataCreate()->createPVStructure(build));
 
+        // we only know about writes to scalar 'value' field
         pvd::PVScalarPtr valfld(root->getSubFieldT<pvd::PVScalar>("value"));
 
+        // attempt convert string to actual field type
         valfld->putFrom(value);
 
-        std::cout<<"Put value "<<valfld<<"\n";
-        return root;
+        args.root = root; // non-const -> const
+
+        // mark only 'value' field to be sent.
+        // other fields w/ default values won't be sent.
+        args.tosend.set(valfld->getFieldOffset());
+
+        std::cout<<"Put value "<<valfld<<" sending="<<args.tosend<<"\n";
     }
 
-    virtual void putDone(const TestPutEvent &evt)
+    virtual void putDone(const TestPutEvent &evt) OVERRIDE FINAL
     {
         switch(evt.event) {
         case TestPutEvent::Fail:
diff --git a/src/testing/pv/pvaTestClient.h b/src/testing/pv/pvaTestClient.h
index 1fd6b70..aaf5be8 100644
--- a/src/testing/pv/pvaTestClient.h
+++ b/src/testing/pv/pvaTestClient.h
@@ -142,8 +142,13 @@ public:
     //! callbacks for put()
     struct epicsShareClass PutCallback {
         virtual ~PutCallback() {}
+        struct Args {
+            Args(epics::pvData::BitSet& tosend) :tosend(tosend) {}
+            epics::pvData::PVStructure::const_shared_pointer root;
+            epics::pvData::BitSet& tosend;
+        };
         //! Called to build the value to be sent once the type info is known
-        virtual epics::pvData::PVStructure::const_shared_pointer putBuild(const epics::pvData::StructureConstPtr& build) =0;
+        virtual void putBuild(const epics::pvData::StructureConstPtr& build, Args& args) =0;
         virtual void putDone(const TestPutEvent& evt)=0;
     };
 
diff --git a/src/testing/pvaTestClientGet.cpp b/src/testing/pvaTestClientGet.cpp
index 5b8a5df..20f5cd2 100644
--- a/src/testing/pvaTestClientGet.cpp
+++ b/src/testing/pvaTestClientGet.cpp
@@ -97,10 +97,15 @@ struct GetPutter : public pva::ChannelPutRequester,
 
         } else if(putcb){
             TestClientChannel::PutCallback *cb(putcb);
-            pvd::PVStructure::const_shared_pointer val;
+            pvd::BitSet::shared_pointer tosend(new pvd::BitSet);
+            TestClientChannel::PutCallback::Args args(*tosend);
             try {
                 UnGuard U(G);
-                val = cb->putBuild(structure);
+                cb->putBuild(structure, args);
+                if(!args.root)
+                    throw std::logic_error("No put value provided");
+                else if(args.root->getStructure().get()!=structure.get())
+                    throw std::logic_error("Provided put value with wrong type");
             }catch(std::exception& e){
                 if(putcb) {
                     event.message = e.what();
@@ -111,10 +116,8 @@ struct GetPutter : public pva::ChannelPutRequester,
             }
             // check putcb again after UnGuard
             if(putcb) {
-                pvd::BitSet::shared_pointer all(new pvd::BitSet);
-                all->set(0);
                 channelPut->lastRequest();
-                channelPut->put(std::tr1::const_pointer_cast<pvd::PVStructure>(val), all);
+                channelPut->put(std::tr1::const_pointer_cast<pvd::PVStructure>(args.root), tosend);
                 started = true;
             }
         }