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

remove more code for destroy

Browse Source
This commit is contained in:
mrkraimer
2017-09-06 14:06:41 -04:00
parent a652086e91
commit 39c8eb90e0
5 changed files with 24 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/caProvider.cpp
+8 -4
View File
@@ -127,10 +127,6 @@ void CAChannelProvider::poll()
{
}
void CAChannelProvider::destroy()
{
std::cerr << "CAChannelProvider::destroy() should not be called\n";
}
void CAChannelProvider::threadAttach()
{
@@ -139,6 +135,7 @@ void CAChannelProvider::threadAttach()
void CAChannelProvider::initialize()
{
if(DEBUG_LEVEL>0) std::cout << "CAChannelProvider::initialize()\n";
/* Create Channel Access */
int result = ca_context_create(ca_enable_preemptive_callback);
if (result != ECA_NORMAL) {
@@ -166,6 +163,11 @@ void ca_factory_cleanup(void*)
void CAClientFactory::start()
{
if(DEBUG_LEVEL>0) std::cout << "CAClientFactory::start()\n";
if(ChannelProviderRegistry::clients()->getProvider("ca")) {
// do not start twice
return;
}
epicsSignalInstallSigAlarmIgnore();
epicsSignalInstallSigPipeIgnore();
registerRefCounter("CAChannelProvider", &CAChannelProvider::num_instances);
@@ -175,7 +177,9 @@ void CAClientFactory::start()
registerRefCounter("CAChannelMonitor", &CAChannelMonitor::num_instances);
if(ChannelProviderRegistry::clients()->add<CAChannelProvider>("ca", false))
{
epicsAtExit(&ca_factory_cleanup, NULL);
}
}
void CAClientFactory::stop()