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

still working on RAII

Browse Source
This commit is contained in:
mrkraimer
2016-05-19 12:01:21 -04:00
parent adc008dee6
commit a0cc581d3f
4 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pvaClient.cpp
View File

@@ -38,13 +38,6 @@ public:
PvaClientChannelCache(){}
~PvaClientChannelCache(){
if(PvaClient::getDebug()) cout << "PvaClientChannelCache::~PvaClientChannelCache\n";
map<string,PvaClientChannelPtr>::iterator iter;
for(iter = pvaClientChannelMap.begin(); iter != pvaClientChannelMap.end(); ++iter)
{
PvaClientChannelPtr pvaChannel = iter->second;
pvaChannel->destroy();
}
// pvaClientChannelMap.clear();
}
PvaClientChannelPtr getChannel(
string const & channelName,
@@ -153,8 +146,16 @@ PvaClient::~PvaClient() {
}
if(PvaClient::debug) showCache();
pvaClientChannelCache.reset();
if(pvaStarted) ClientFactory::stop();
if(caStarted) CAClientFactory::stop();
if(pvaStarted){
if(PvaClient::debug) cout<< "calling ClientFactory::stop()\n";
ClientFactory::stop();
if(PvaClient::debug) cout<< "after calling ClientFactory::stop()\n";
}
if(caStarted) {
if(PvaClient::debug) cout<< "calling CAClientFactory::stop()\n";
CAClientFactory::stop();
if(PvaClient::debug) cout<< "after calling CAClientFactory::stop()\n";
}
}
string PvaClient:: getRequesterName()