integrated last workshop demo channelGet micro-benchmark test

pvAccessApp/Makefile

@@ -85,6 +85,10 @@ SRC_DIRS += $(PVACCESS)/rpcClient
 INC += rpcClient.h
 LIBSRCS += rpcClient.cpp
 
+SRC_DIRS += $(PVACCESS)/mb
+INC += pvAccessMB.h
+LIBSRCS += pvAccessMB.cpp
+
 LIBRARY = pvAccess
 pvAccess_LIBS += Com
 pvAccess_LIBS += pvData

pvAccessApp/remoteClient/clientContextImpl.cpp

@@ -31,6 +31,8 @@
 #include <pv/serializationHelper.h>
 #include <pv/convert.h>
 
+#include <pv/pvAccessMB.h>
+
 //#include <tr1/unordered_map>
 
 using std::tr1::dynamic_pointer_cast;
@@ -542,6 +544,10 @@ namespace epics {
 
             virtual void send(ByteBuffer* buffer, TransportSendControl* control) {
                 int32 pendingRequest = getPendingRequest();
+                bool initStage = (pendingRequest & QOS_INIT);
+
+                MB_POINT_CONDITIONAL(channelGet, 1, !initStage); 
+                
                 if (pendingRequest < 0)
                 {
                     BaseRequestImpl::send(buffer, control);
@@ -553,12 +559,14 @@ namespace epics {
                 buffer->putInt(m_ioid);
                 buffer->putByte((int8)m_pendingRequest);
 
-                if (pendingRequest & QOS_INIT)
+                if (initStage)
                 {
                     // pvRequest
                 	SerializationHelper::serializePVRequest(buffer, control, m_pvRequest);
                 }
 
+                MB_POINT_CONDITIONAL(channelGet, 2, !initStage); 
+
                 stopRequest();
             }
 
@@ -591,6 +599,9 @@ namespace epics {
             }
 
             virtual bool normalResponse(Transport::shared_pointer const & transport, int8 /*version*/, ByteBuffer* payloadBuffer, int8 /*qos*/, const Status& status) {
+                
+                MB_POINT(channelGet, 8);
+                
                 if (!status.isSuccess())
                 {
                     EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
@@ -604,6 +615,8 @@ namespace epics {
                     m_structure->deserialize(payloadBuffer, transport.get(), m_bitSet.get());
                 }
                 
+                MB_POINT(channelGet, 9);
+                
                 EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
                 return true;
             }
@@ -611,6 +624,9 @@ namespace epics {
             virtual void get(bool lastRequest) {
 
                 {
+                    MB_INC_AUTO_ID(channelGet);
+                    MB_POINT(channelGet, 0);
+
                     Lock guard(m_mutex);
                     if (m_destroyed) {
                         EXCEPTION_GUARD(m_channelGetRequester->getDone(destroyedStatus));
@@ -3025,6 +3041,7 @@ namespace epics {
                 ChannelProviderImpl(std::tr1::shared_ptr<ClientContextImpl> const & context) :
                         m_context(context)
                 {
+                    MB_INIT;
                 }
 
                 virtual epics::pvData::String getProviderName()

pvAccessApp/server/responseHandlers.cpp

@@ -16,6 +16,8 @@
 
 #include <sstream>
 
+#include <pv/pvAccessMB.h>
+
 using std::ostringstream;
 using std::hex;
 
@@ -45,8 +47,9 @@ void ServerBadResponse::handleResponse(osiSockAddr* responseFrom,
 
 ServerResponseHandler::ServerResponseHandler(ServerContextImpl::shared_pointer const & context)
 {
+    MB_INIT;                
+
     ResponseHandler::shared_pointer badResponse(new ServerBadResponse(context));
-                
     m_handlerTable.resize(CMD_RPC+1);
                 
     m_handlerTable[CMD_BEACON].reset(new ServerNoopResponse(context, "Beacon")); /*  0 */
@@ -554,6 +557,9 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
 	}
 	else
 	{
+        MB_INC_AUTO_ID(channelGet);
+        MB_POINT(channelGet, 3);
+        
 		const bool lastRequest = (QOS_DESTROY & qosCode) != 0;
 
 		ServerChannelGetRequesterImpl::shared_pointer request = static_pointer_cast<ServerChannelGetRequesterImpl>(channel->getRequest(ioid));
@@ -569,6 +575,8 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
 			return;
 		}
 
+        MB_POINT(channelGet, 4);
+        
 		request->getChannelGet()->get(lastRequest);
 	}
 }
@@ -632,6 +640,7 @@ void ServerChannelGetRequesterImpl::channelGetConnect(const Status& status, Chan
 
 void ServerChannelGetRequesterImpl::getDone(const Status& status)
 {
+    MB_POINT(channelGet, 5);
 	{
 		Lock guard(_mutex);
 		_status = status;
@@ -691,11 +700,15 @@ void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
 		}
 		else
 		{
+            MB_POINT(channelGet, 6);
+            {
 		    // we locked _mutex above, so _channelGet is valid
 		    ScopedLock lock(_channelGet);
 		    
 			_bitSet->serialize(buffer, control);
 			_pvStructure->serialize(buffer, control, _bitSet.get());
+            }
+            MB_POINT(channelGet, 7);
 		}
 	}