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

replace destroy by RAII; many implementation changes

Browse Source
This commit is contained in:
mrkraimer
2016-05-13 12:50:47 -04:00
parent 9f8073aaa2
commit 3cc13e2c5a
18 changed files with 531 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/pvaClientMultiChannel.cpp
View File

@@ -56,18 +56,18 @@ PvaClientMultiChannel::PvaClientMultiChannel(
createRequest(CreateRequest::create()),
isDestroyed(false)
{
if(PvaClient::getDebug()) cout<< "PvaClientMultiChannel::PvaClientMultiChannel()\n";
}
PvaClientMultiChannel::~PvaClientMultiChannel()
{
destroy();
}
void PvaClientMultiChannel::destroy()
{
if(PvaClient::getDebug()) cout<< "PvaClientMultiChannel::~PvaClientMultiChannel()\n";
{
Lock xx(mutex);
if(isDestroyed) return;
if(isDestroyed) {
cerr<< "Why was PvaClientMultiChannel::~PvaClientMultiChannel() called more then once????\n";
return;
}
isDestroyed = true;
}
pvaClientChannelArray.clear();
@@ -75,11 +75,7 @@ void PvaClientMultiChannel::destroy()
void PvaClientMultiChannel::checkConnected()
{
if(numConnected==0){
Status status = connect(3.0);
if(status.isOK()) return;
throw std::runtime_error("pvaClientMultiChannel connect failure");
}
if(numConnected==0) connect();
}
epics::pvData::shared_vector<const string> PvaClientMultiChannel::getChannelNames()