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

channelConnectThread changes

Browse Source
This commit is contained in:
mrkraimer
2018-09-12 14:12:08 -04:00
parent 36e18bfd21
commit 7b7511fc0f
2 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/ca/caChannel.cpp
View File

@@ -52,17 +52,43 @@ static void ca_connection_handler(struct connection_handler_args args)
CAChannel *channel = static_cast<CAChannel*>(ca_puser(args.chid));
if (args.op == CA_OP_CONN_UP) {
channel->connected();
channel->connect(true);
} else if (args.op == CA_OP_CONN_DOWN) {
channel->disconnected();
channel->connect(false);
}
}
void CAChannel::connected()
void CAChannel::connect(bool isConnected)
{
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::connected " << channelName << endl;
}
{
Lock lock(requestsMutex);
channelConnected = isConnected;
}
channelConnectThread->channelConnected(notifyChannelRequester);
}
void CAChannel::notifyClient()
{
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::notifyClient " << channelName << endl;
}
CAChannelProviderPtr provider(channelProvider.lock());
if(!provider) return;
ChannelRequester::shared_pointer req(channelRequester.lock());
if(!req) return;
bool isConnected = false;
{
Lock lock(requestsMutex);
isConnected = channelConnected;
}
if(!isConnected) {
EXCEPTION_GUARD(req->channelStateChange(
shared_from_this(), Channel::DISCONNECTED));
return;
}
bool callChannelCreated = false;
{
Lock lock(requestsMutex);
@@ -72,26 +98,9 @@ void CAChannel::connected()
}
}
if(callChannelCreated) {
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()));
provider->addChannel(shared_from_this());
EXCEPTION_GUARD(req->channelCreated(Status::Ok, shared_from_this()));
}
ChannelRequester::shared_pointer req(channelRequester.lock());
if(req) {
EXCEPTION_GUARD(req->channelStateChange(
shared_from_this(), Channel::CONNECTED));
}
}
void CAChannel::notifyClient()
{
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::notifyClient " << channelName << endl;
}
CAChannelProviderPtr provider(channelProvider.lock());
if(!provider) return;
provider->addChannel(shared_from_this());
while(!getFieldQueue.empty()) {
getFieldQueue.front()->activate();
getFieldQueue.pop();
@@ -114,24 +123,9 @@ void CAChannel::notifyClient()
addMonitor(monitor);
monitorQueue.pop();
}
ChannelRequester::shared_pointer req(channelRequester.lock());
if(!req) return;
EXCEPTION_GUARD(req->channelCreated(Status::Ok, shared_from_this()));
EXCEPTION_GUARD(req->channelStateChange(shared_from_this(), Channel::CONNECTED));
}
void CAChannel::disconnected()
{
if(DEBUG_LEVEL>0) {
cout<< "CAChannel::disconnected " << channelName << endl;
}
ChannelRequester::shared_pointer req(channelRequester.lock());
if(req) {
EXCEPTION_GUARD(req->channelStateChange(
shared_from_this(), Channel::DISCONNECTED));
}
}
CAChannel::CAChannel(std::string const & channelName,
CAChannelProvider::shared_pointer const & channelProvider,
@@ -141,6 +135,7 @@ CAChannel::CAChannel(std::string const & channelName,
channelRequester(channelRequester),
channelID(0),
channelCreated(false),
channelConnected(false),
channelConnectThread(ChannelConnectThread::get())
{
if(DEBUG_LEVEL>0) {