Added times to start/stop log messages

pull/1/head
Michael Brown 2006-12-27 22:56:39 +00:00
parent 4cc1c1bd4c
commit 1a11cc5c5b
1 changed files with 12 additions and 8 deletions

View File

@ -69,7 +69,8 @@ void start_timer ( struct retry_timer *timer ) {
timer->start = currticks(); timer->start = currticks();
if ( timer->timeout < MIN_TIMEOUT ) if ( timer->timeout < MIN_TIMEOUT )
timer->timeout = MIN_TIMEOUT; timer->timeout = MIN_TIMEOUT;
DBG2 ( "Timer %p started\n", timer ); DBG ( "Timer %p started at time %ld (expires at %ld)\n",
timer, timer->start, ( timer->start + timer->timeout ) );
} }
/** /**
@ -81,16 +82,18 @@ void start_timer ( struct retry_timer *timer ) {
*/ */
void stop_timer ( struct retry_timer *timer ) { void stop_timer ( struct retry_timer *timer ) {
unsigned long old_timeout = timer->timeout; unsigned long old_timeout = timer->timeout;
unsigned long now = currticks();
unsigned long runtime; unsigned long runtime;
/* If timer was already stopped, do nothing */ /* If timer was already stopped, do nothing */
if ( ! timer->start ) if ( ! timer->start )
return; return;
DBG2 ( "Timer %p stopped\n", timer );
list_del ( &timer->list ); list_del ( &timer->list );
runtime = currticks() - timer->start; runtime = ( now - timer->start );
timer->start = 0; timer->start = 0;
DBG ( "Timer %p stopped at time %ld (ran for %ld)\n",
timer, now, runtime );
/* Update timer. Variables are: /* Update timer. Variables are:
* *
@ -113,8 +116,8 @@ void stop_timer ( struct retry_timer *timer ) {
timer->timeout -= ( timer->timeout >> 3 ); timer->timeout -= ( timer->timeout >> 3 );
timer->timeout += ( runtime >> 1 ); timer->timeout += ( runtime >> 1 );
if ( timer->timeout != old_timeout ) { if ( timer->timeout != old_timeout ) {
DBG ( "Timer %p updated to %ldms\n", timer, DBG ( "Timer %p timeout updated to %ld\n",
( ( 1000 * timer->timeout ) / TICKS_PER_SEC ) ); timer, timer->timeout );
} }
} }
} }
@ -128,7 +131,8 @@ static void timer_expired ( struct retry_timer *timer ) {
int fail; int fail;
/* Stop timer without performing RTT calculations */ /* Stop timer without performing RTT calculations */
DBG2 ( "Timer %p stopped on expiry\n", timer ); DBG ( "Timer %p stopped at time %ld on expiry\n",
timer, currticks() );
list_del ( &timer->list ); list_del ( &timer->list );
timer->start = 0; timer->start = 0;
timer->count++; timer->count++;
@ -137,8 +141,8 @@ static void timer_expired ( struct retry_timer *timer ) {
timer->timeout <<= 1; timer->timeout <<= 1;
if ( ( fail = ( timer->timeout > MAX_TIMEOUT ) ) ) if ( ( fail = ( timer->timeout > MAX_TIMEOUT ) ) )
timer->timeout = MAX_TIMEOUT; timer->timeout = MAX_TIMEOUT;
DBG ( "Timer %p backed off to %ldms\n", timer, DBG ( "Timer %p timeout backed off to %ld\n",
( ( 1000 * timer->timeout ) / TICKS_PER_SEC ) ); timer, timer->timeout );
/* Call expiry callback */ /* Call expiry callback */
timer->expired ( timer, fail ); timer->expired ( timer, fail );