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

termination and error handling changes.

Browse Source 
epicsAtExit is no longer used to call ca_context_destroy.
It is now called from the destructor for CAChannelProvider.

Several changes were made for handling errors.
This commit is contained in:
mrkraimer
2018-02-06 10:20:29 -05:00
parent 3bb2f25bed
commit fcaeb414a0
4 changed files with 90 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/ca/caProvider.cpp
View File

@@ -64,6 +64,7 @@ CAChannelProvider::~CAChannelProvider()
CAChannelPtr caChannel(caChannelList[i].lock());
if(caChannel) channelQ.push(caChannel);
}
caChannelList.clear();
}
while(!channelQ.empty()) {
if(DEBUG_LEVEL>0) {
@@ -74,6 +75,9 @@ CAChannelProvider::~CAChannelProvider()
channelQ.front()->disconnectChannel();
channelQ.pop();
}
attachContext();
ca_flush_io();
ca_context_destroy();
}
std::string CAChannelProvider::getProviderName()
@@ -115,10 +119,10 @@ Channel::shared_pointer CAChannelProvider::createChannel(
ChannelRequester::shared_pointer const & channelRequester,
short priority)
{
threadAttach();
static std::string emptyString;
return createChannel(channelName, channelRequester, priority, emptyString);
Channel::shared_pointer channel(
createChannel(channelName, channelRequester, priority, emptyString));
return channel;
}
Channel::shared_pointer CAChannelProvider::createChannel(
@@ -163,9 +167,15 @@ void CAChannelProvider::poll()
}
void CAChannelProvider::threadAttach()
void CAChannelProvider::attachContext()
{
ca_attach_context(current_context);
if(ca_current_context()) return;
int result = ca_attach_context(current_context);
if (result != ECA_NORMAL) {
std::cout <<
"CA error %s occurred while calling ca_attach_context:"
<< ca_message(result) << std::endl;
}
}
void CAChannelProvider::initialize()
@@ -181,19 +191,6 @@ void CAChannelProvider::initialize()
current_context = ca_current_context();
}
static
void ca_factory_cleanup(void*)
{
if(DEBUG_LEVEL>0) std::cout << "ca_factory_cleanup\n";
try {
ChannelProviderRegistry::clients()->remove("ca");
ca_context_destroy();
} catch(std::exception& e) {
LOG(logLevelWarn, "Error on unregistering \"ca\" factory: %s", e.what());
}
}
void CAClientFactory::start()
{
if(DEBUG_LEVEL>0) std::cout << "CAClientFactory::start()\n";
@@ -209,9 +206,9 @@ void CAClientFactory::start()
registerRefCounter("CAChannelPut", &CAChannelPut::num_instances);
registerRefCounter("CAChannelMonitor", &CAChannelMonitor::num_instances);
if(ChannelProviderRegistry::clients()->add<CAChannelProvider>("ca", true))
if(!ChannelProviderRegistry::clients()->add<CAChannelProvider>("ca", true))
{
epicsAtExit(&ca_factory_cleanup, NULL);
throw std::runtime_error("CAClientFactory::start failed");
}
}