updated google test install procedure
This commit is contained in:
@@ -16,6 +16,9 @@
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include <pv/mb.h>
|
||||
MB_DECLARE(channelGetServer, 100000);
|
||||
|
||||
using std::ostringstream;
|
||||
using std::hex;
|
||||
|
||||
@@ -45,8 +48,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 +558,9 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
|
||||
}
|
||||
else
|
||||
{
|
||||
MB_INC_AUTO_ID(channelGetServer);
|
||||
MB_POINT(channelGetServer, 3);
|
||||
|
||||
const bool lastRequest = (QOS_DESTROY & qosCode) != 0;
|
||||
|
||||
ServerChannelGetRequesterImpl::shared_pointer request = static_pointer_cast<ServerChannelGetRequesterImpl>(channel->getRequest(ioid));
|
||||
@@ -569,6 +576,8 @@ void ServerGetHandler::handleResponse(osiSockAddr* responseFrom,
|
||||
return;
|
||||
}
|
||||
|
||||
MB_POINT(channelGetServer, 4);
|
||||
|
||||
request->getChannelGet()->get(lastRequest);
|
||||
}
|
||||
}
|
||||
@@ -632,6 +641,7 @@ void ServerChannelGetRequesterImpl::channelGetConnect(const Status& status, Chan
|
||||
|
||||
void ServerChannelGetRequesterImpl::getDone(const Status& status)
|
||||
{
|
||||
MB_POINT(channelGetServer, 5);
|
||||
{
|
||||
Lock guard(_mutex);
|
||||
_status = status;
|
||||
@@ -691,11 +701,15 @@ void ServerChannelGetRequesterImpl::send(ByteBuffer* buffer, TransportSendContro
|
||||
}
|
||||
else
|
||||
{
|
||||
MB_POINT(channelGetServer, 6);
|
||||
{
|
||||
// we locked _mutex above, so _channelGet is valid
|
||||
ScopedLock lock(_channelGet);
|
||||
|
||||
_bitSet->serialize(buffer, control);
|
||||
_pvStructure->serialize(buffer, control, _bitSet.get());
|
||||
}
|
||||
MB_POINT(channelGetServer, 7);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user