From 1aecd168ab7454c285f58f9435fd02c0db834e4d Mon Sep 17 00:00:00 2001 From: Gasper Jansa Date: Fri, 18 Feb 2011 17:57:29 +0100 Subject: [PATCH] mutex fix --- pvAccessApp/server/responseHandlers.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/pvAccessApp/server/responseHandlers.cpp b/pvAccessApp/server/responseHandlers.cpp index c4fb82d..7418652 100644 --- a/pvAccessApp/server/responseHandlers.cpp +++ b/pvAccessApp/server/responseHandlers.cpp @@ -515,7 +515,7 @@ namespace epics { if (init) { // pvRequest - PVStructurePtr pvRequest = transport->getIntrospectionRegistry()->deserializePVRequest(payloadBuffer, transport); + //PVStructurePtr pvRequest = transport->getIntrospectionRegistry()->deserializePVRequest(payloadBuffer, transport); // create... // new ChannelGetRequesterImpl(_context, channel, ioid, transport, pvRequest); @@ -535,18 +535,9 @@ namespace epics { return; } - /* - // check read access rights - if (!AccessRights.READ.isSet(channel.getAccessRights())) - { - getFailureResponse(transport, ioid, qosCode, BaseChannelRequester.noReadACLStatus); - if (lastRequest) - request.destroy(); - return; - } - */ - // request.getChannelGet().get(lastRequest); - // } + request.getChannelGet().get(lastRequest); + } + */ } @@ -564,7 +555,7 @@ namespace epics { epics::pvData::BitSet* bitSet) { { - Lock guard(&_mutex); + Lock guard(_mutex); _bitSet = bitSet; _pvStructure = pvStructure; _status = status; @@ -582,7 +573,7 @@ namespace epics { void ChannelGetRequesterImpl::getDone(const epics::pvData::Status& status) { { - Lock guard(&_mutex); + Lock guard(_mutex); _status = status; } _transport->enqueueSendRequest(this); @@ -621,7 +612,7 @@ namespace epics { buffer->put((int8)request); IntrospectionRegistry* introspectionRegistry = _transport->getIntrospectionRegistry(); { - Lock guard(&_mutex); + Lock guard(_mutex); introspectionRegistry->serializeStatus(buffer, control, _status); } @@ -629,7 +620,7 @@ namespace epics { { if (request & QOS_INIT) { - Lock guard(&_mutex); + Lock guard(_mutex); introspectionRegistry->serialize(_pvStructure != NULL ? _pvStructure->getField() : NULL, buffer, control); }