upgraded ipAddrToAscii API and improved shutdown procedures
This commit is contained in:
@@ -136,11 +136,11 @@ extern "C" void cacOnceFunc ( void * )
|
||||
// cac::cac ()
|
||||
//
|
||||
cac::cac ( cacNotify & notifyIn ) :
|
||||
ipToAEngine ( "dnsQuery" ),
|
||||
programBeginTime ( epicsTime::getCurrent() ),
|
||||
connTMO ( CA_CONN_VERIFY_PERIOD ),
|
||||
cbMutex ( notifyIn ),
|
||||
globalServiceList ( globalServiceListCAC.getReference () ),
|
||||
ipToAEngine ( ipAddrToAsciiEngine::allocate () ),
|
||||
timerQueue ( epicsTimerQueueActive::allocate ( false,
|
||||
lowestPriorityLevelAbove(epicsThreadGetPrioritySelf()) ) ),
|
||||
pUserName ( 0 ),
|
||||
@@ -299,6 +299,8 @@ cac::~cac ()
|
||||
|
||||
this->timerQueue.release ();
|
||||
|
||||
this->ipToAEngine.release ();
|
||||
|
||||
errlogFlush ();
|
||||
|
||||
// its ok for channels and subscriptions to still
|
||||
@@ -554,8 +556,9 @@ bool cac::transferChanToVirtCircuit (
|
||||
char acc[64];
|
||||
pChan->getPIIU()->hostName ( acc, sizeof ( acc ) );
|
||||
msgForMultiplyDefinedPV * pMsg = new ( this->mdpvFreeList )
|
||||
msgForMultiplyDefinedPV ( *this, pChan->pName (), acc, addr );
|
||||
pMsg->ioInitiate ( this->ipToAEngine );
|
||||
msgForMultiplyDefinedPV ( this->ipToAEngine,
|
||||
*this, pChan->pName (), acc );
|
||||
pMsg->ioInitiate ( addr );
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -193,7 +193,6 @@ public:
|
||||
|
||||
private:
|
||||
localHostName hostNameCache;
|
||||
ipAddrToAsciiEngine ipToAEngine;
|
||||
cacServiceList services;
|
||||
chronIntIdResTable < nciu > chanTable;
|
||||
//
|
||||
@@ -242,6 +241,7 @@ private:
|
||||
epicsSingleton
|
||||
< cacServiceList >::reference
|
||||
globalServiceList;
|
||||
ipAddrToAsciiEngine & ipToAEngine;
|
||||
epicsTimerQueueActive & timerQueue;
|
||||
char * pUserName;
|
||||
class udpiiu * pudpiiu;
|
||||
|
||||
Reference in New Issue
Block a user