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

fixes for bugs 133 and 134 in Mantis

Browse Source
This commit is contained in:
Jeff Hill
2004-09-23 23:15:22 +00:00
parent 107f1fa37f
commit 7b7a07c667
28 changed files with 1386 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ca/tcpSendWatchdog.cpp
View File

@@ -44,6 +44,7 @@ epicsTimerNotify::expireStatus tcpSendWatchdog::expire (
const epicsTime & currentTime )
{
callbackManager mgr ( this->ctxNotify, this->cbMutex );
epicsGuard < epicsMutex > guard ( this->mutex );
if ( this->iiu.bytesArePendingInOS() ) {
this->iiu.printf ( mgr.cbGuard,
"The CA client library is disconnecting after a flush request "
@@ -51,13 +52,12 @@ epicsTimerNotify::expireStatus tcpSendWatchdog::expire (
"application schedualing problem\n" );
}
# ifdef DEBUG
epicsGuard < epicsMutex > guard ( this->mutex );
char hostName[128];
this->iiu.hostName ( guard, hostName, sizeof ( hostName ) );
debugPrintf ( ( "Request not accepted by CA server %s for %g sec. Disconnecting.\n",
hostName, this->period ) );
# endif
this->iiu.sendTimeoutNotify ( currentTime, mgr );
this->iiu.sendTimeoutNotify ( currentTime, mgr, guard );
return noRestart;
}
@@ -71,3 +71,4 @@ void tcpSendWatchdog::cancel ()
this->timer.cancel ();
}