epics/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

MultipleDataResponseHandler and comment on alignment

Browse Source
This commit is contained in:
Matej Sekoranja
2014-09-10 08:26:22 +02:00
parent 15dd1497f2
commit e32e7e4ed5
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/remoteClient/clientContextImpl.cpp
View File

@@ -2674,6 +2674,48 @@ namespace epics {
};
class MultipleDataResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
MultipleDataResponseHandler(ClientContextImpl::shared_pointer const & context) :
AbstractClientResponseHandler(context, "Multiple data response")
{
}
virtual ~MultipleDataResponseHandler() {
}
virtual void handleResponse(osiSockAddr* responseFrom,
Transport::shared_pointer const & transport, int8 version, int8 command,
size_t payloadSize, epics::pvData::ByteBuffer* payloadBuffer)
{
AbstractClientResponseHandler::handleResponse(responseFrom, transport, version, command, payloadSize, payloadBuffer);
// TODO add submessage payload size, so that non-existant IOID can be skipped
// and others not lost
ClientContextImpl::shared_pointer context = _context.lock();
while (true)
{
transport->ensureData(4);
pvAccessID ioid = payloadBuffer->getInt();
if (ioid == INVALID_IOID)
return;
ResponseRequest::shared_pointer rr = context->getResponseRequest(ioid);
if (rr.get())
{
DataResponse::shared_pointer nrr = dynamic_pointer_cast<DataResponse>(rr);
if (nrr.get())
nrr->response(transport, version, payloadBuffer);
else
return; // we cannot deserialize, we are lost in stream, we must stop
}
else
return; // we cannot deserialize, we are lost in stream, we must stop
}
}
};
class SearchResponseHandler : public AbstractClientResponseHandler, private epics::pvData::NoDefaultMethods {
public:
SearchResponseHandler(ClientContextImpl::shared_pointer const & context) :
@@ -2983,7 +3025,7 @@ namespace epics {
m_handlerTable[CMD_PROCESS] = dataResponse; /* 16 - process response */
m_handlerTable[CMD_GET_FIELD] = dataResponse; /* 17 - get field response */
m_handlerTable[CMD_MESSAGE].reset(new MessageHandler(context)); /* 18 - message to Requester */
m_handlerTable[CMD_MULTIPLE_DATA] = badResponse; // TODO new MultipleDataResponseHandler(context), /* 19 - grouped monitors */
m_handlerTable[CMD_MULTIPLE_DATA].reset(new MultipleDataResponseHandler(context)); /* 19 - grouped monitors */
m_handlerTable[CMD_RPC] = dataResponse; /* 20 - RPC response */
m_handlerTable[CMD_CANCEL_REQUEST] = badResponse; /* 21 - cancel request */
}