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

fix problems when client uses PvaClientMonitorRequester

Browse Source
This commit is contained in:
mrkraimer
2016-04-05 15:52:51 -04:00
parent c55bf7ec45
commit bf57c06b06
3 changed files with 115 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pvaClientChannel.cpp
View File

@@ -293,7 +293,11 @@ Status PvaClientChannel::waitConnect(double timeout)
if(isDestroyed) throw std::runtime_error("pvaClientChannel was destroyed");
if(channel->isConnected()) return Status::Ok;
}
waitForConnect.wait(timeout);
if(timeout>0.0) {
waitForConnect.wait(timeout);
} else {
waitForConnect.wait();
}
return channelConnectStatus;
}
@@ -458,7 +462,10 @@ PvaClientArrayPtr PvaClientChannel::createArray(PVStructurePtr const & pvReques
}
PvaClientMonitorPtr PvaClientChannel::monitor() {return monitor("value,alarm,timeStamp");}
PvaClientMonitorPtr PvaClientChannel::monitor()
{
return monitor("value,alarm,timeStamp");
}
PvaClientMonitorPtr PvaClientChannel::monitor(string const & request)
{