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

eliminated redundant code from subscription and channel destroy

Browse Source
This commit is contained in:
Jeff Hill
2004-06-17 23:32:36 +00:00
parent 7f3db9f676
commit e5ba349551
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/ca/ca_client_context.cpp
View File

@@ -185,21 +185,31 @@ ca_client_context::~ca_client_context ()
}
}
void ca_client_context::destroyChannelPrivate (
oldChannelNotify & chan,
epicsGuard < epicsMutex > & cbGuard )
{
epicsGuard < epicsMutex > guard ( this->mutex );
try {
chan.eliminateExcessiveSendBacklog (
&cbGuard, guard );
}
catch ( cacChannel::notConnected & ) {
// intentionally ignored
}
chan.destructor ( cbGuard, guard );
this->oldChannelNotifyFreeList.release ( & chan );
}
void ca_client_context::destroyChannel ( oldChannelNotify & chan )
{
if ( this->pCallbackGuard.get() ) {
epicsGuard < epicsMutex > guard ( this->mutex );
chan.eliminateExcessiveSendBacklog (
this->pCallbackGuard.get(), guard );
chan.destructor ( *this->pCallbackGuard.get(), guard );
this->oldChannelNotifyFreeList.release ( & chan );
epicsGuard < epicsMutex > * pCBGuard = this->pCallbackGuard.get();
if ( pCBGuard ) {
destroyChannelPrivate ( chan, *pCBGuard );
}
else {
epicsGuard < epicsMutex > cbGuard ( this->cbMutex );
epicsGuard < epicsMutex > guard ( this->mutex );
chan.eliminateExcessiveSendBacklog ( &cbGuard, guard );
chan.destructor ( cbGuard, guard );
this->oldChannelNotifyFreeList.release ( & chan );
destroyChannelPrivate ( chan, cbGuard );
}
}
@@ -227,6 +237,21 @@ void ca_client_context::destroyPutCallback (
this->putCallbackFreeList.release ( & pcb );
}
void ca_client_context::clearSubscriptionPrivate (
evid pMon, epicsGuard < epicsMutex > & cbGuard )
{
epicsGuard < epicsMutex > guard ( this->mutex );
oldChannelNotify & chan = pMon->channel ();
try {
chan.eliminateExcessiveSendBacklog (
&cbGuard, guard );
}
catch ( cacChannel::notConnected & ) {
// intentionally ignored
}
pMon->ioCancel ( cbGuard, guard );
}
void ca_client_context::destroySubscription (
epicsGuard < epicsMutex > & guard, oldSubscription & os )
{