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

server cleanup

Browse Source
This commit is contained in:
Matej Sekoranja
2012-07-30 12:21:13 +02:00
parent 878f44ffb8
commit 39d6a6bc19
7 changed files with 94 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pvAccessApp/server/serverChannelImpl.cpp
View File

@@ -53,19 +53,20 @@ void ServerChannelImpl::registerRequest(const pvAccessID id, Destroyable::shared
void ServerChannelImpl::unregisterRequest(const pvAccessID id)
{
Lock guard(_mutex);
_iter = _requests.find(id);
if(_iter != _requests.end())
std::map<pvAccessID, epics::pvData::Destroyable::shared_pointer>::iterator iter = _requests.find(id);
if(iter != _requests.end())
{
_requests.erase(_iter);
_requests.erase(iter);
}
}
Destroyable::shared_pointer ServerChannelImpl::getRequest(const pvAccessID id)
{
_iter = _requests.find(id);
if(_iter != _requests.end())
Lock guard(_mutex);
std::map<pvAccessID, epics::pvData::Destroyable::shared_pointer>::iterator iter = _requests.find(id);
if(iter != _requests.end())
{
return _iter->second;
return iter->second;
}
return Destroyable::shared_pointer();
}
@@ -74,7 +75,6 @@ void ServerChannelImpl::destroy()
{
Lock guard(_mutex);
if (_destroyed) return;
_destroyed = true;
// destroy all requests
@@ -111,8 +111,7 @@ void ServerChannelImpl::destroyAllRequests()
while(_requests.size() != 0)
{
_iter = _requests.begin();
_iter->second->destroy();
_requests.begin()->second->destroy();
}
_requests.clear();