From fd56d36b092383e6578129412d631b2a6838f3bb Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <matej.sekoranja@cosylab.com>
Date: Wed, 13 Mar 2013 21:39:19 +0100
Subject: [PATCH] MB_POINT stage description added

---
 pvAccessApp/remoteClient/clientContextImpl.cpp | 10 +++++-----
 pvAccessApp/server/responseHandlers.cpp        | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pvAccessApp/remoteClient/clientContextImpl.cpp b/pvAccessApp/remoteClient/clientContextImpl.cpp
index e55dc98..63d1bd6 100644
--- a/pvAccessApp/remoteClient/clientContextImpl.cpp
+++ b/pvAccessApp/remoteClient/clientContextImpl.cpp
@@ -546,7 +546,7 @@ namespace epics {
                 int32 pendingRequest = getPendingRequest();
                 bool initStage = (pendingRequest & QOS_INIT);
 
-                MB_POINT_CONDITIONAL(channelGet, 1, !initStage); 
+                MB_POINT_CONDITIONAL(channelGet, 1, "client channelGet->serialize (start)", !initStage); 
                 
                 if (pendingRequest < 0)
                 {
@@ -565,7 +565,7 @@ namespace epics {
                 	SerializationHelper::serializePVRequest(buffer, control, m_pvRequest);
                 }
 
-                MB_POINT_CONDITIONAL(channelGet, 2, !initStage); 
+                MB_POINT_CONDITIONAL(channelGet, 2, "client channelGet->serialize (end)", !initStage); 
 
                 stopRequest();
             }
@@ -600,7 +600,7 @@ namespace epics {
 
             virtual bool normalResponse(Transport::shared_pointer const & transport, int8 /*version*/, ByteBuffer* payloadBuffer, int8 /*qos*/, const Status& status) {
                 
-                MB_POINT(channelGet, 8);
+                MB_POINT(channelGet, 8, "client channelGet->deserialize (start)");
                 
                 if (!status.isSuccess())
                 {
@@ -615,7 +615,7 @@ namespace epics {
                     m_structure->deserialize(payloadBuffer, transport.get(), m_bitSet.get());
                 }
                 
-                MB_POINT(channelGet, 9);
+                MB_POINT(channelGet, 9, "client channelGet->deserialize (end), just before channelGet->getDone() is called");
                 
                 EXCEPTION_GUARD(m_channelGetRequester->getDone(status));
                 return true;
@@ -625,7 +625,7 @@ namespace epics {
 
                 {
                     MB_INC_AUTO_ID(channelGet);
-                    MB_POINT(channelGet, 0);
+                    MB_POINT(channelGet, 0, "client channelGet->get()");
 
                     Lock guard(m_mutex);
                     if (m_destroyed) {
diff --git a/pvAccessApp/server/responseHandlers.cpp b/pvAccessApp/server/responseHandlers.cpp
index 08e4363..01e60a8 100644
--- a/pvAccessApp/server/responseHandlers.cpp
+++ b/pvAccessApp/server/responseHandlers.cpp
@@ -558,7 +558,7 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
 	else
 	{
         MB_INC_AUTO_ID(channelGet);
-        MB_POINT(channelGet, 3);
+        MB_POINT(channelGet, 3, "server channelGet->deserialize request (start)");
         
 		const bool lastRequest = (QOS_DESTROY & qosCode) != 0;
 
@@ -575,7 +575,7 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
 			return;
 		}
 
-        MB_POINT(channelGet, 4);
+        MB_POINT(channelGet, 4, "server channelGet->deserialize request (end)");
         
 		request->getChannelGet()->get(lastRequest);
 	}
@@ -640,7 +640,7 @@ void ServerChannelGetRequesterImpl::channelGetConnect(const Status& status, Chan
 
 void ServerChannelGetRequesterImpl::getDone(const Status& status)
 {
-    MB_POINT(channelGet, 5);
+    MB_POINT(channelGet, 5, "server channelGet->getDone()");
 	{
 		Lock guard(_mutex);
 		_status = status;
@@ -700,7 +700,7 @@ void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
 		}
 		else
 		{
-            MB_POINT(channelGet, 6);
+            MB_POINT(channelGet, 6, "server channelGet->serialize response (start)");
             {
 		    // we locked _mutex above, so _channelGet is valid
 		    ScopedLock lock(_channelGet);
@@ -708,7 +708,7 @@ void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
 			_bitSet->serialize(buffer, control);
 			_pvStructure->serialize(buffer, control, _bitSet.get());
             }
-            MB_POINT(channelGet, 7);
+            MB_POINT(channelGet, 7, "server channelGet->serialize response (end)");
 		}
 	}