diff --git a/src/ca/tcpRecvWatchdog.h b/src/ca/tcpRecvWatchdog.h index 443710130..488cfac19 100644 --- a/src/ca/tcpRecvWatchdog.h +++ b/src/ca/tcpRecvWatchdog.h @@ -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; diff --git a/src/ca/tcpiiu.cpp b/src/ca/tcpiiu.cpp index 73c8c2acb..75cbabd6d 100644 --- a/src/ca/tcpiiu.cpp +++ b/src/ca/tcpiiu.cpp @@ -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 ); } } }