From 89e140505c7763912cccc305b0261d445e76d5e6 Mon Sep 17 00:00:00 2001 From: Gasper Jansa Date: Fri, 25 Feb 2011 17:17:44 +0100 Subject: [PATCH] ref count removed from base requester --- pvAccessApp/server/baseChannelRequester.cpp | 20 +------------------- pvAccessApp/server/baseChannelRequester.h | 4 +--- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/pvAccessApp/server/baseChannelRequester.cpp b/pvAccessApp/server/baseChannelRequester.cpp index f549e4b..8469598 100644 --- a/pvAccessApp/server/baseChannelRequester.cpp +++ b/pvAccessApp/server/baseChannelRequester.cpp @@ -23,8 +23,7 @@ BaseChannelRequester::BaseChannelRequester(ServerContextImpl* context, ServerCha _transport(transport), _channel(channel), _context(context), - _pendingRequest(BaseChannelRequester::NULL_REQUEST), - _refCount(1) + _pendingRequest(BaseChannelRequester::NULL_REQUEST) { } @@ -73,23 +72,6 @@ void BaseChannelRequester::sendFailureMessage(const int8 command, Transport* tra { transport->enqueueSendRequest( new BaseChannelRequesterFailureMessageTransportSender(command, transport, ioid, qos, status)); } -/* -void BaseChannelRequester::release() -{ - _mutex.lock(); - _refCount--; - _mutex.unlock(); - if (_refCount == 0) - { - delete this; - } -} - -void BaseChannelRequester::acquire() -{ - Lock guard(_mutex); - _refCount++; -}*/ BaseChannelRequesterMessageTransportSender::BaseChannelRequesterMessageTransportSender(const pvAccessID ioid, const String message,const epics::pvData::MessageType messageType): _ioid(ioid), diff --git a/pvAccessApp/server/baseChannelRequester.h b/pvAccessApp/server/baseChannelRequester.h index 8bf5c6d..33affe6 100644 --- a/pvAccessApp/server/baseChannelRequester.h +++ b/pvAccessApp/server/baseChannelRequester.h @@ -14,7 +14,7 @@ namespace epics { namespace pvAccess { -class BaseChannelRequester : virtual public epics::pvData::Requester, public epics::pvData::Destroyable//, virtual public ReferenceCountingInstance +class BaseChannelRequester : virtual public epics::pvData::Requester, public epics::pvData::Destroyable { public: BaseChannelRequester(ServerContextImpl* context, ServerChannelImpl* channel,const pvAccessID ioid, Transport* transport); @@ -27,8 +27,6 @@ public: void message(const String message, const epics::pvData::MessageType messageType); static void message(Transport* transport, const pvAccessID ioid, const String message, const epics::pvData::MessageType messageType); static void sendFailureMessage(const int8 command, Transport* transport, const pvAccessID ioid, const int8 qos, const Status status); - //void release(); - //void acquire(); static const Status okStatus; static const Status badCIDStatus;