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

port from pvAccessCPP-md

Browse Source
This commit is contained in:
Matej Sekoranja
2011-05-12 12:47:55 +02:00
parent a077d7d084
commit c36ba5264d
68 changed files with 4762 additions and 5612 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pvAccessApp/server/serverChannelImpl.cpp
+12 -25
View File
@@ -4,36 +4,33 @@
#include "serverChannelImpl.h"
// TODO remove
#include "responseHandlers.h"
using namespace epics::pvData;
namespace epics { namespace pvAccess {
ServerChannelImpl::ServerChannelImpl(Channel* channel, pvAccessID cid,
pvAccessID sid, epics::pvData::PVField* securityToken):
ServerChannelImpl::ServerChannelImpl(Channel::shared_pointer& channel, pvAccessID cid, pvAccessID sid, epics::pvData::PVField::shared_pointer& securityToken):
_channel(channel),
_cid(cid),
_sid(cid),
_destroyed(false)
{
if (channel == NULL)
if (!channel.get())
{
THROW_BASE_EXCEPTION("non null local channel required");
THROW_BASE_EXCEPTION("non-null channel required");
}
}
Channel* ServerChannelImpl::getChannel()
Channel::shared_pointer ServerChannelImpl::getChannel()
{
return _channel;
}
pvAccessID ServerChannelImpl::getCID()
pvAccessID ServerChannelImpl::getCID() const
{
return _cid;
}
pvAccessID ServerChannelImpl::getSID()
pvAccessID ServerChannelImpl::getSID() const
{
return _sid;
}
@@ -44,13 +41,8 @@ int16 ServerChannelImpl::getAccessRights()
return 0;
}
void ServerChannelImpl::registerRequest(const pvAccessID id, Destroyable* request)
void ServerChannelImpl::registerRequest(const pvAccessID id, Destroyable::shared_pointer& request)
{
if (request == NULL)
{
THROW_BASE_EXCEPTION("request == null");
}
Lock guard(_mutex);
_requests[id] = request;
}
@@ -65,19 +57,18 @@ void ServerChannelImpl::unregisterRequest(const pvAccessID id)
}
}
Destroyable* ServerChannelImpl::getRequest(const pvAccessID id)
Destroyable::shared_pointer ServerChannelImpl::getRequest(const pvAccessID id)
{
_iter = _requests.find(id);
if(_iter != _requests.end())
{
return _iter->second;
}
return NULL;
return Destroyable::shared_pointer();
}
void ServerChannelImpl::destroy()
{
{
Lock guard(_mutex);
if (_destroyed) return;
@@ -86,13 +77,9 @@ void ServerChannelImpl::destroy()
// destroy all requests
destroyAllRequests();
// now thats ugly!!!
(static_cast<ServerChannelRequesterImpl*>(_channel->getChannelRequester()))->release();
// TODO make impl that does shares channels (and does ref counting)!!!
// try catch?
// ... and the channel
// TODO try catch
_channel->destroy();
}
delete this;
}
void ServerChannelImpl::printInfo()