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

initialize time at last send when creating search timer. This

Browse Source 
guarantees no possibility of bogus search response delay
measurement
This commit is contained in:
Jeff Hill
2006-11-18 00:50:35 +00:00
parent b0e5ae5a58
commit e308021980
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ca/searchTimer.cpp
View File

@@ -44,6 +44,7 @@ searchTimer::searchTimer (
const unsigned indexIn,
epicsMutex & mutexIn,
bool boostPossibleIn ) :
timeAtLastSend ( epicsTime::getCurrent () ),
timer ( queueIn.createTimer () ),
iiu ( iiuIn ),
mutex ( mutexIn ),
@@ -60,9 +61,10 @@ searchTimer::searchTimer (
{
}
void searchTimer::start ()
void searchTimer::start ( epicsGuard < epicsMutex > & guard )
{
this->timer.start ( *this, this->period () );
guard.assertIdenticalMutex ( this->mutex );
this->timer.start ( *this, this->period ( guard ) );
}
searchTimer::~searchTimer ()
@@ -132,6 +134,8 @@ epicsTimerNotify::expireStatus searchTimer::expire (
this->iiu.noSearchRespNotify (
guard, *pChan, this->index );
}
this->timeAtLastSend = currentTime;
// boost search period for channels not recently
// searched for if there was some success
@@ -273,8 +277,6 @@ epicsTimerNotify::expireStatus searchTimer::expire (
this->dgSeqNoAtTimerExpireEnd =
this->iiu.datagramSeqNumber ( guard ) - 1u;
this->timeAtLastSend = currentTime;
# ifdef DEBUG
if ( this->searchAttempts ) {
char buf[64];
@@ -284,13 +286,13 @@ epicsTimerNotify::expireStatus searchTimer::expire (
}
# endif
return expireStatus ( restart, this->period() );
return expireStatus ( restart, this->period ( guard ) );
}
void searchTimer::show ( unsigned level ) const
{
epicsGuard < epicsMutex > guard ( this->mutex );
::printf ( "search timer delay %f\n", this->period() );
::printf ( "search timer delay %f\n", this->period ( guard ) );
::printf ( "%u channels with search request pending\n",
this->chanListReqPending.count () );
tsDLIterConst < nciu > pChan = this->chanListReqPending.firstIter ();
@@ -317,6 +319,7 @@ void searchTimer::uninstallChanDueToSuccessfulSearchResponse (
ca_uint32_t respDatagramSeqNo, bool seqNumberIsValid,
const epicsTime & currentTime )
{
guard.assertIdenticalMutex ( this->mutex );
this->uninstallChan ( guard, chan );
if ( this->stopped ) {
@@ -334,7 +337,7 @@ void searchTimer::uninstallChanDueToSuccessfulSearchResponse (
// reasonable timer period
if ( validResponse ) {
double measured = currentTime - this->timeAtLastSend;
this->iiu.updateRTTE ( measured );
this->iiu.updateRTTE ( guard, measured );
if ( this->searchResponses < UINT_MAX ) {
this->searchResponses++;
@@ -379,9 +382,11 @@ void searchTimer::uninstallChan (
chan.channelNode::listMember = channelNode::cs_none;
}
double searchTimer::period () const
double searchTimer::period (
epicsGuard < epicsMutex > & guard ) const
{
return (1 << this->index ) * this->iiu.getRTTE ();
guard.assertIdenticalMutex ( this->mutex );
return (1 << this->index ) * this->iiu.getRTTE ( guard );
}
searchTimerNotify::~searchTimerNotify () {}