diff --git a/src/client/clientGet.cpp b/src/client/clientGet.cpp index aaa69fe..25f4d10 100644 --- a/src/client/clientGet.cpp +++ b/src/client/clientGet.cpp @@ -72,7 +72,10 @@ struct GetPutter : public pva::ChannelPutRequester, } virtual std::string getRequesterName() OVERRIDE FINAL - { return "GetPutter"; } + { + Guard G(mutex); + return op ? op->getChannel()->getRequesterName() : ""; + } virtual void channelPutConnect( const epics::pvData::Status& status, diff --git a/src/client/clientMonitor.cpp b/src/client/clientMonitor.cpp index 2d6e4fa..33fe905 100644 --- a/src/client/clientMonitor.cpp +++ b/src/client/clientMonitor.cpp @@ -89,7 +89,10 @@ struct Monitor::Impl : public pva::MonitorRequester } virtual std::string getRequesterName() OVERRIDE FINAL - { return "RPCer"; } + { + Guard G(mutex); + return chan ? chan->getRequesterName() : ""; + } virtual void monitorConnect(pvd::Status const & status, diff --git a/src/client/clientRPC.cpp b/src/client/clientRPC.cpp index 4dff91a..a10ac55 100644 --- a/src/client/clientRPC.cpp +++ b/src/client/clientRPC.cpp @@ -83,7 +83,10 @@ struct RPCer : public pva::ChannelRPCRequester, } virtual std::string getRequesterName() OVERRIDE FINAL - { return "RPCer"; } + { + Guard G(mutex); + return op ? op->getChannel()->getRequesterName() : ""; + } virtual void channelRPCConnect( const epics::pvData::Status& status,