client.h cleanup

src/client/clientGet.cpp

@@ -17,11 +17,6 @@
 #include "clientpvt.h"
 #include "pv/pvAccess.h"
 
-namespace pvd = epics::pvData;
-namespace pva = epics::pvAccess;
-typedef epicsGuard<epicsMutex> Guard;
-typedef epicsGuardRelease<epicsMutex> UnGuard;
-
 namespace {
 
 struct Getter : public pva::ChannelGetRequester,
@@ -30,27 +25,26 @@ struct Getter : public pva::ChannelGetRequester,
 {
     mutable epicsMutex mutex;
 
-    bool started;
     operation_type::shared_pointer op;
 
-    pvac::ClientChannel::GetCallback *getcb;
+    pvac::ClientChannel::GetCallback *cb;
     pvac::GetEvent event;
 
     static size_t num_instances;
 
-    explicit Getter(pvac::ClientChannel::GetCallback* cb) :started(false), getcb(cb)
+    explicit Getter(pvac::ClientChannel::GetCallback* cb) :cb(cb)
     {REFTRACE_INCREMENT(num_instances);}
     virtual ~Getter() {REFTRACE_DECREMENT(num_instances);}
 
     void callEvent(Guard& G, pvac::GetEvent::event_t evt = pvac::GetEvent::Fail)
     {
-        if(!getcb) return;
+        if(!cb) return;
 
         event.event = evt;
-        pvac::ClientChannel::GetCallback *cb=getcb;
-        getcb = 0;
+        pvac::ClientChannel::GetCallback *C=cb;
+        cb = 0;
         UnGuard U(G);
-        cb->getDone(event);
+        C->getDone(event);
     }
 
     virtual std::string name() const OVERRIDE FINAL
@@ -65,7 +59,7 @@ struct Getter : public pva::ChannelGetRequester,
         // keepalive for safety in case callback wants to destroy us
         std::tr1::shared_ptr<Getter> keepalive(internal_shared_from_this());
         Guard G(mutex);
-        if(started && op) op->cancel();
+        if(op) op->cancel();
         callEvent(G, pvac::GetEvent::Cancel);
     }
 
@@ -82,8 +76,7 @@ struct Getter : public pva::ChannelGetRequester,
     {
         std::tr1::shared_ptr<Getter> keepalive(internal_shared_from_this());
         Guard G(mutex);
-        if(started) return;
-        if(!getcb) return;
+        if(!cb) return;
 
         if(!status.isOK()) {
             event.message = status.getMessage();
@@ -95,7 +88,6 @@ struct Getter : public pva::ChannelGetRequester,
 
         } else {
             channelGet->get();
-            started = true;
 
         }
     }
@@ -116,7 +108,7 @@ struct Getter : public pva::ChannelGetRequester,
     {
         std::tr1::shared_ptr<Getter> keepalive(internal_shared_from_this());
         Guard G(mutex);
-        if(!getcb) return;
+        if(!cb) return;
 
         if(!status.isOK()) {
             event.message = status.getMessage();

src/client/clientMonitor.cpp

@@ -16,11 +16,6 @@
 #include "clientpvt.h"
 #include "pv/pvAccess.h"
 
-namespace pvd = epics::pvData;
-namespace pva = epics::pvAccess;
-typedef epicsGuard<epicsMutex> Guard;
-typedef epicsGuardRelease<epicsMutex> UnGuard;
-
 namespace pvac {
 
 struct Monitor::Impl : public pva::MonitorRequester,

src/client/clientPut.cpp

@@ -17,11 +17,6 @@
 #include "clientpvt.h"
 #include "pv/pvAccess.h"
 
-namespace pvd = epics::pvData;
-namespace pva = epics::pvAccess;
-typedef epicsGuard<epicsMutex> Guard;
-typedef epicsGuardRelease<epicsMutex> UnGuard;
-
 namespace {
 
 struct Putter : public pva::ChannelPutRequester,
@@ -36,24 +31,24 @@ struct Putter : public pva::ChannelPutRequester,
     operation_type::shared_pointer op;
     pvd::StructureConstPtr puttype;
 
-    pvac::ClientChannel::PutCallback *putcb;
+    pvac::ClientChannel::PutCallback *cb;
     pvac::GetEvent event;
 
     static size_t num_instances;
 
-    Putter(pvac::ClientChannel::PutCallback* cb, bool getcurrent) :getcurrent(getcurrent), started(false), putcb(cb)
+    Putter(pvac::ClientChannel::PutCallback* cb, bool getcurrent) :getcurrent(getcurrent), started(false), cb(cb)
     {REFTRACE_INCREMENT(num_instances);}
     virtual ~Putter() {REFTRACE_DECREMENT(num_instances);}
 
     void callEvent(Guard& G, pvac::GetEvent::event_t evt = pvac::GetEvent::Fail)
     {
-        if(!putcb) return;
+        if(!cb) return;
 
         event.event = evt;
-        pvac::ClientChannel::PutCallback *cb=putcb;
-        putcb = 0;
+        pvac::ClientChannel::PutCallback *C=cb;
+        cb = 0;
         UnGuard U(G);
-        cb->putDone(event);
+        C->putDone(event);
     }
 
     virtual std::string name() const OVERRIDE FINAL
@@ -87,7 +82,7 @@ struct Putter : public pva::ChannelPutRequester,
         Guard G(mutex);
         op = channelPut; // we may be called before createChannelPut() has returned.
         puttype = structure;
-        if(started || !putcb) return;
+        if(started || !cb) return;
 
         if(!status.isOK()) {
             event.message = status.getMessage();
@@ -124,23 +119,23 @@ struct Putter : public pva::ChannelPutRequester,
                const pvd::BitSet::shared_pointer& tosend)
     {
         try {
-            pvac::ClientChannel::PutCallback *cb(putcb);
+            pvac::ClientChannel::PutCallback *C(cb);
             UnGuard U(G);
-            cb->putBuild(puttype, args);
+            C->putBuild(puttype, args);
             if(!args.root)
                 throw std::logic_error("No put value provided");
             else if(*args.root->getStructure()!=*puttype)
                 throw std::logic_error("Provided put value with wrong type");
         }catch(std::exception& e){
-            if(putcb) {
+            if(cb) {
                 event.message = e.what();
                 callEvent(G);
             } else {
                 LOG(pva::logLevelInfo, "Lost exception in %s: %s", CURRENT_FUNCTION, e.what());
             }
         }
-        // check putcb again after UnGuard
-        if(putcb) {
+        // check cb again after UnGuard
+        if(cb) {
             channelPut->put(std::tr1::const_pointer_cast<pvd::PVStructure>(args.root), tosend);
             started = true;
         }
@@ -154,7 +149,7 @@ struct Putter : public pva::ChannelPutRequester,
     {
         std::tr1::shared_ptr<Putter> keepalive(internal_shared_from_this());
         Guard G(mutex);
-        if(!putcb) return;
+        if(!cb) return;
 
         if(!status.isOK()) {
             event.message = status.getMessage();
@@ -175,7 +170,7 @@ struct Putter : public pva::ChannelPutRequester,
     {
         std::tr1::shared_ptr<Putter> keepalive(internal_shared_from_this());
         Guard G(mutex);
-        if(!putcb) return;
+        if(!cb) return;
 
         if(!status.isOK()) {
             event.message = status.getMessage();

src/client/clientRPC.cpp

@@ -15,11 +15,6 @@
 #include "clientpvt.h"
 #include "pv/pvAccess.h"
 
-namespace pvd = epics::pvData;
-namespace pva = epics::pvAccess;
-typedef epicsGuard<epicsMutex> Guard;
-typedef epicsGuardRelease<epicsMutex> UnGuard;
-
 namespace {
 
 struct RPCer : public pva::ChannelRPCRequester,

src/client/clientpvt.h

@@ -5,6 +5,11 @@
 
 #include <pva/client.h>
 
+namespace pvd = epics::pvData;
+namespace pva = epics::pvAccess;
+typedef epicsGuard<epicsMutex> Guard;
+typedef epicsGuardRelease<epicsMutex> UnGuard;
+
 namespace pvac{namespace detail{
 /* Like std::tr1::enable_shared_from_this
  * with the notion of internal vs. external references.