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

improved ioCancel and shutdown sequence

Browse Source
This commit is contained in:
Jeff Hill
2002-05-09 17:22:36 +00:00
parent ec3bc12ba4
commit 813a4f526c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ca/cac.cpp
View File

@@ -257,11 +257,6 @@ cac::~cac ()
freeListCleanup ( this->tcpSmallRecvBufFreeList );
freeListCleanup ( this->tcpLargeRecvBufFreeList );
if ( this->pudpiiu ) {
epicsGuard < callbackMutex > autoMutexCB ( this->cbMutex );
this->pudpiiu->removeAllChannels ( autoMutexCB );
}
delete [] this->pUserName;
this->beaconTable.traverse ( &bhe::destroy );
@@ -813,10 +808,12 @@ void cac::ioCancel ( nciu &chan, const cacChannel::ioid &id )
}
// wait for any IO callbacks in progress to complete
// prior to destroying the IO object
epicsGuard < callbackMutex > autoMutex ( this->cbMutex );
{
epicsGuard < callbackMutex > cbGuard ( this->cbMutex );
}
// now it is safe to destroy the IO object
{
epicsGuard < cacMutex > autoMutex ( this->mutex );
epicsGuard < cacMutex > guard ( this->mutex );
pmiu->destroy ( *this );
}
}