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

fixed send thread blocks trying to destroy the IIU because the

Browse Source 
callback lock was taken without using a callback lock manager
This commit is contained in:
Jeff Hill
2005-12-08 16:23:15 +00:00
parent 25d861b724
commit bd14b17c94
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ca/cac.cpp
View File

@@ -1133,13 +1133,13 @@ void cac::selfTest (
void cac::destroyIIU ( tcpiiu & iiu )
{
{
epicsGuard < epicsMutex > cbGuard ( this->cbMutex );
callbackManager mgr ( this->notify, this->cbMutex );
epicsGuard < epicsMutex > guard ( this->mutex );
this->iiuUninstallInProgress = true;
if ( iiu.channelCount ( guard ) ) {
char hostNameTmp[64];
iiu.getHostName ( guard, hostNameTmp, sizeof ( hostNameTmp ) );
genLocalExcep ( cbGuard, guard, *this, ECA_DISCONN, hostNameTmp );
genLocalExcep ( mgr.cbGuard, guard, *this, ECA_DISCONN, hostNameTmp );
}
osiSockAddr addr = iiu.getNetworkAddress ( guard );
if ( addr.sa.sa_family == AF_INET ) {
@@ -1151,7 +1151,7 @@ void cac::destroyIIU ( tcpiiu & iiu )
}
assert ( this->pudpiiu );
iiu.disconnectAllChannels ( cbGuard, guard, *this->pudpiiu );
iiu.disconnectAllChannels ( mgr.cbGuard, guard, *this->pudpiiu );
this->serverTable.remove ( iiu );
this->circuitList.remove ( iiu );