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

fix bug in src/pvaClientMonitor.cpp; other minor changes

Browse Source
This commit is contained in:
mrkraimer
2016-06-10 07:48:36 -04:00
parent 04b5434b69
commit 32fb16fcf0
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pvaClientGet.cpp
View File

@@ -150,7 +150,7 @@ void PvaClientGet::channelGetConnect(
Channel::shared_pointer chan(channel.lock());
if(chan) channelName = chan->getChannelName();
cout << "PvaClientGet::channelGetConnect"
<< " channelName " << channelGet->getChannel()->getChannelName()
<< " channelName " << channelName
<< " status.isOK " << (status.isOK() ? "true" : "false")
<< endl;
}
@@ -208,17 +208,16 @@ void PvaClientGet::connect()
void PvaClientGet::issueConnect()
{
Channel::shared_pointer chan(channel.lock());
if(connectState!=connectIdle) {
Channel::shared_pointer chan(channel.lock());
string channelName("disconnected");
if(chan) channelName = chan->getChannelName();
string message = string("channel ") + channelName
+ " pvaClientGet already connected ";
throw std::runtime_error(message);
}
connectState = connectActive;
Channel::shared_pointer chan(channel.lock());
if(chan) {
connectState = connectActive;
channelGet = chan->createChannelGet(channelGetRequester,pvRequest);
return;
}

6
src/pvaClientMonitor.cpp
View File

@@ -240,7 +240,7 @@ Status PvaClientMonitor::waitConnect()
{
if(PvaClient::getDebug()) cout << "PvaClientMonitor::waitConnect\n";
if(connectState==connected) {
if(connectStatus.isOK()) connectState = connectIdle;
if(!connectStatus.isOK()) connectState = connectIdle;
return connectStatus;
}
if(connectState!=connectActive) {
@@ -264,7 +264,7 @@ Status PvaClientMonitor::waitConnect()
return connectStatus;
}
void PvaClientMonitor::setRequester(PvaClientMonitorRequesterPtr const & pvaClientMonitorrRequester)
void PvaClientMonitor::setRequester(PvaClientMonitorRequesterPtr const & pvaClientMonitorRequester)
{
if(PvaClient::getDebug()) {
string channelName("disconnected");
@@ -274,7 +274,7 @@ void PvaClientMonitor::setRequester(PvaClientMonitorRequesterPtr const & pvaClie
<< " channelName " << channelName
<< endl;
}
this->pvaClientMonitorRequester = pvaClientMonitorrRequester;
this->pvaClientMonitorRequester = pvaClientMonitorRequester;
}
void PvaClientMonitor::start()

43
src/pvaClientPut.cpp
View File

@@ -157,16 +157,22 @@ void PvaClientPut::channelPutConnect(
StructureConstPtr const & structure)
{
if(PvaClient::getDebug()) {
string channelName("disconnected");
Channel::shared_pointer chan(channel.lock());
if(chan) channelName = chan->getChannelName();
cout << "PvaClientPut::channelPutConnect"
<< " channelName " << channelPut->getChannel()->getChannelName()
<< " channelName " << channelName
<< " status.isOK " << (status.isOK() ? "true" : "false")
<< endl;
}
channelPutConnectStatus = status;
this->channelPut = channelPut;
if(status.isOK()) {
pvaClientData = PvaClientPutData::create(structure);
pvaClientData->setMessagePrefix(channelPut->getChannel()->getChannelName());
{
Lock xx(mutex);
channelPutConnectStatus = status;
this->channelPut = channelPut;
if(status.isOK()) {
pvaClientData = PvaClientPutData::create(structure);
pvaClientData->setMessagePrefix(channelPut->getChannel()->getChannelName());
}
}
waitForConnect.signal();
@@ -251,17 +257,20 @@ void PvaClientPut::issueConnect()
Status PvaClientPut::waitConnect()
{
if(connectState==connected) {
if(!channelPutConnectStatus.isOK()) connectState = connectIdle;
return channelPutConnectStatus;
}
if(connectState!=connectActive) {
Channel::shared_pointer chan(channel.lock());
string channelName("disconnected");
if(chan) channelName = chan->getChannelName();
string message = string("channel ") + channelName
+ " PvaClientPut::waitConnect illegal connect state ";
throw std::runtime_error(message);
{
Lock xx(mutex);
if(connectState==connected) {
if(!channelPutConnectStatus.isOK()) connectState = connectIdle;
return channelPutConnectStatus;
}
if(connectState!=connectActive) {
Channel::shared_pointer chan(channel.lock());
string channelName("disconnected");
if(chan) channelName = chan->getChannelName();
string message = string("channel ") + channelName
+ " PvaClientPut::waitConnect illegal connect state ";
throw std::runtime_error(message);
}
}
waitForConnect.wait();
if(!channelPutConnectStatus.isOK()) connectState = connectIdle;