made CA client service list an epics singleton

This commit is contained in:
Jeff Hill
2002-03-22 21:25:41 +00:00
parent 017bf6f96d
commit e0956c2c11
4 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -664,7 +664,7 @@ cacChannel & cac::createChannel ( const char * pName,
pIO = this->services.createChannel ( pName, chan, pri );
if ( ! pIO ) {
pIO = cacGlobalServiceList.createChannel ( pName, chan, pri );
pIO = pGlobalServiceListCAC->createChannel ( pName, chan, pri );
if ( ! pIO ) {
if ( ! this->pudpiiu || ! this->pSearchTmr ) {
if ( ! this->setupUDP () ) {
+2 -1
View File
@@ -238,7 +238,8 @@ private:
cacServiceList & operator = ( const cacServiceList & );
};
epicsShareExtern cacServiceList cacGlobalServiceList;
template < class T > class epicsSingleton;
epicsShareExtern epicsSingleton < cacServiceList > pGlobalServiceListCAC;
epicsShareFunc int epicsShareAPI ca_register_service ( cacService *pService );
+4 -4
View File
@@ -14,14 +14,14 @@
* 505 665 1831
*/
#include "iocinf.h"
#include "epicsGuard.h"
#include "epicsSingleton.h"
#define epicsExportSharedSymbols
#include "iocinf.h"
#include "epicsGuard.h"
#include "cacIO.h"
#undef epicsExportSharedSymbols
epicsShareDef cacServiceList cacGlobalServiceList;
epicsShareDef epicsSingleton < cacServiceList > pGlobalServiceListCAC;
cacServiceList::cacServiceList ()
{
+1 -1
View File
@@ -52,7 +52,7 @@ dbBaseIO::dbBaseIO () {}
dbServiceIOLoadTimeInit::dbServiceIOLoadTimeInit ()
{
cacGlobalServiceList.registerService ( this->dbio );
pGlobalServiceListCAC->registerService ( this->dbio );
}
dbServiceIO::dbServiceIO () :