d/iperf3-tls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle timers longer than 2147 seconds (2^31 microseconds).

Browse Source
This commit is contained in:
Jef Poskanzer 2013-02-18 09:06:50 -08:00
parent ba55284d44
commit 037c0c2367
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/iperf_api.c
View File

@ -681,20 +681,20 @@ iperf_init_test(struct iperf_test *test)
if (test->settings->bytes == 0) {
test->done = 0;
cd.p = test;
test->timer = tmr_create(&now, test_timer_proc, cd, test->duration * SEC_TO_US, 0);
test->timer = tmr_create(&now, test_timer_proc, cd, (int64_t) test->duration * SEC_TO_US, 0);
if (test->timer == NULL)
return -1;
}
if (test->stats_interval != 0) {
cd.p = test;
test->stats_timer = tmr_create(&now, stats_timer_proc, cd, test->stats_interval * SEC_TO_US, 1);
test->stats_timer = tmr_create(&now, stats_timer_proc, cd, (int64_t) test->stats_interval * SEC_TO_US, 1);
if (test->stats_timer == NULL)
return -1;
}
if (test->reporter_interval != 0) {
cd.p = test;
test->reporter_timer = tmr_create(&now, reporter_timer_proc, cd, test->reporter_interval * SEC_TO_US, 1);
test->reporter_timer = tmr_create(&now, reporter_timer_proc, cd, (int64_t) test->reporter_interval * SEC_TO_US, 1);
if (test->reporter_timer == NULL)
return -1;
}

6
src/timer.c
View File

@ -159,12 +159,12 @@ tmr_timeout( struct timeval* nowP )
/* Since the list is sorted, we only need to look at the first timer. */
if ( timers == NULL )
return NULL;
usecs = ( timers->time.tv_sec - now.tv_sec ) * 1000000L +
usecs = ( timers->time.tv_sec - now.tv_sec ) * 1000000LL +
( timers->time.tv_usec - now.tv_usec );
if ( usecs <= 0 )
usecs = 0;
timeout.tv_sec = usecs / 1000000L;
timeout.tv_usec = usecs % 1000000L;
timeout.tv_sec = usecs / 1000000LL;
timeout.tv_usec = usecs % 1000000LL;
return &timeout;
}