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

bhe no-longer self deletes

Browse Source
This commit is contained in:
Jeff Hill
2000-11-20 17:34:19 +00:00
parent e3bd7003ba
commit f113853b05
3 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ca/cac.cpp
View File

@@ -221,10 +221,9 @@ cac::~cac ()
if ( this->pUserName ) {
delete [] this->pUserName;
}
this->sgTable.destroyAllEntries ();
this->beaconTable.destroyAllEntries ();
this->chanTable.destroyAllEntries ();
this->sgTable.traverse ( CASG::destroy );
this->beaconTable.traverse ( bhe::destroy );
this->chanTable.traverse ( nciu::destroy );
osiSockRelease ();
@@ -262,6 +261,7 @@ void cac::processRecvBacklog ()
this->iiuListLimbo.add ( *piiu );
if ( pBHE ) {
this->beaconTable.remove ( *pBHE );
pBHE->destroy ();
}
@@ -402,9 +402,9 @@ bhe *cac::createBeaconHashEntry (const inetAddrID &ina, const osiTime &initialTi
pBHE = this->beaconTable.lookup ( ina );
if ( !pBHE ) {
pBHE = new bhe (*this, initialTimeStamp, ina);
pBHE = new bhe ( initialTimeStamp, ina );
if ( pBHE ) {
if ( this->beaconTable.add (*pBHE) < 0 ) {
if ( this->beaconTable.add ( *pBHE ) < 0 ) {
pBHE->destroy ();
pBHE = 0;
}
@@ -500,18 +500,6 @@ void cac::beaconNotify ( const inetAddrID &addr )
}
/*
* cac::removeBeaconInetAddr ()
*/
void cac::removeBeaconInetAddr (const inetAddrID &ina)
{
osiAutoMutex autoMutex ( this->defaultMutex );
bhe *pBHE;
pBHE = this->beaconTable.remove ( ina );
assert (pBHE);
}
int cac::pend ( double timeout, int early )
{
int status;