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

dont pass time stamp to receive watchdog notify

Browse Source
This commit is contained in:
Jeff Hill
2005-10-31 22:24:38 +00:00
parent c9f43cf50a
commit 6c69138be0
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ca/tcpRecvWatchdog.h
+5 -10
View File
@@ -38,24 +38,19 @@ public:
double periodIn, epicsTimerQueue & );
virtual ~tcpRecvWatchdog ();
void sendBacklogProgressNotify (
epicsGuard < epicsMutex > &,
const epicsTime & currentTime );
epicsGuard < epicsMutex > & );
void messageArrivalNotify (
epicsGuard < epicsMutex > & guard,
const epicsTime & currentTime );
epicsGuard < epicsMutex > & guard );
void probeResponseNotify (
epicsGuard < epicsMutex > &,
const epicsTime & currentTime );
epicsGuard < epicsMutex > & );
void beaconArrivalNotify (
epicsGuard < epicsMutex > &,
const epicsTime & currentTime );
epicsGuard < epicsMutex > & );
void beaconAnomalyNotify ( epicsGuard < epicsMutex > & );
void connectNotify (
epicsGuard < epicsMutex > & );
void sendTimeoutNotify (
epicsGuard < epicsMutex > & cbGuard,
epicsGuard < epicsMutex > & guard,
const epicsTime & currentTime );
epicsGuard < epicsMutex > & guard );
void cancel ();
void shutdown ();
void show ( unsigned level ) const;
src/ca/tcpiiu.cpp
+3 -5
View File
@@ -493,8 +493,7 @@ void tcpRecvThread::run ()
continue;
}
// reschedule connection activity watchdog
this->iiu.recvDog.messageArrivalNotify (
guard, currentTime );
this->iiu.recvDog.messageArrivalNotify ( guard );
}
{
@@ -859,7 +858,6 @@ void tcpiiu::responsiveCircuitNotify (
}
void tcpiiu::sendTimeoutNotify (
const epicsTime & currentTime,
callbackManager & mgr,
epicsGuard < epicsMutex > & guard )
{
@@ -867,7 +865,7 @@ void tcpiiu::sendTimeoutNotify (
guard.assertIdenticalMutex ( this->mutex );
this->unresponsiveCircuitNotify ( mgr.cbGuard, guard );
// setup circuit probe sequence
this->recvDog.sendTimeoutNotify ( mgr.cbGuard, guard, currentTime );
this->recvDog.sendTimeoutNotify ( mgr.cbGuard, guard );
}
void tcpiiu::deferToRecvBacklog ()
@@ -1625,7 +1623,7 @@ bool tcpiiu::flush ( epicsGuard < epicsMutex > & guard )
this->unacknowledgedSendBytes += bytesToBeSent;
if ( this->unacknowledgedSendBytes >
this->socketLibrarySendBufferSize ) {
this->recvDog.sendBacklogProgressNotify ( guard, current );
this->recvDog.sendBacklogProgressNotify ( guard );
}
}
}