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

Make the channelConnectThread per-provider

Browse Source 
This passes the tests (on MacOS).
This commit is contained in:
Andrew Johnson
2020-10-02 18:36:29 -05:00
committed by mdavidsaver
parent 601280836d
commit 2729903a10
6 changed files with 25 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ca/caChannel.cpp
View File

@@ -53,7 +53,9 @@ void CAChannel::connect(bool isConnected)
Lock lock(requestsMutex);
channelConnected = isConnected;
}
channelConnectThread->channelConnected(notifyChannelRequester);
CAChannelProviderPtr provider(channelProvider.lock());
if (!provider) return;
provider->getChannelConnectThread().channelConnected(notifyChannelRequester);
}
void CAChannel::notifyClient()
@@ -107,8 +109,7 @@ CAChannel::CAChannel(std::string const & channelName,
channelRequester(channelRequester),
channelID(0),
channelCreated(false),
channelConnected(false),
channelConnectThread(ChannelConnectThread::get())
channelConnected(false)
{
}