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

channel connect: call requester from channel access callback

Browse Source
This commit is contained in:
mrkraimer
2018-07-24 10:33:15 -04:00
parent 5a271ecf71
commit bac1307136
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ca/caChannel.cpp
View File

@@ -62,6 +62,20 @@ void CAChannel::connected()
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::connected " << channelName << endl;
}
bool callChannelConnected = false;
{
Lock lock(requestsMutex);
if(!channelCreated) {
channelCreated = true;
callChannelConnected = true;
}
}
if(callChannelConnected) {
CAChannelProviderPtr provider(channelProvider.lock());
if(provider) provider->addChannel(shared_from_this());
ChannelRequester::shared_pointer req(channelRequester.lock());
if(req) EXCEPTION_GUARD(req->channelCreated(Status::Ok, shared_from_this()));
}
while(!putQueue.empty()) {
putQueue.front()->activate();
putQueue.pop();
@@ -123,13 +137,8 @@ void CAChannel::activate(short priority)
this,
priority, // TODO mapping
&channelID);
if (result == ECA_NORMAL)
if (result != ECA_NORMAL)
{
channelCreated = true;
CAChannelProviderPtr provider(channelProvider.lock());
if(provider) provider->addChannel(shared_from_this());
EXCEPTION_GUARD(req->channelCreated(Status::Ok, shared_from_this()));
} else {
Status errorStatus(Status::STATUSTYPE_ERROR, string(ca_message(result)));
EXCEPTION_GUARD(req->channelCreated(errorStatus, shared_from_this()));
}