miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix conversion in src/bench.c

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2019-04-03 09:30:54 +00:00
parent 70bc9cc205
commit 5c29753343
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bench.c
View File

@@ -27,11 +27,13 @@ gt_now(void)
#elif defined CLOCK_MONOTONIC #elif defined CLOCK_MONOTONIC
struct timespec tv; struct timespec tv;
clock_gettime(CLOCK_MONOTONIC, &tv); clock_gettime(CLOCK_MONOTONIC, &tv);
return tv.tv_sec * 1000000ULL + tv.tv_nsec / 1000ULL; return (unsigned long long)tv.tv_sec * 1000000ULL
+ (unsigned long long)tv.tv_nsec / 1000ULL;
#else #else
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
return tv.tv_sec * 1000000ULL + tv.tv_usec; return (unsigned long long)tv.tv_sec * 1000000ULL
+ (unsigned long long)tv.tv_usec;
#endif #endif
} }
@@ -116,7 +118,7 @@ gt_bench(int argc, char **argv)
size_t bytes = 0; size_t bytes = 0;
gt_alarm = 0; gt_alarm = 0;
alarm(duration); alarm((unsigned int)duration);
while (!gt_quit && !gt_alarm) { while (!gt_quit && !gt_alarm) {
if (chacha) { if (chacha) {
@@ -133,7 +135,7 @@ gt_bench(int argc, char **argv)
total_dt += gt_now() - now; total_dt += gt_now() - now;
total_bytes += bytes; total_bytes += bytes;
mbps = (total_bytes * 8.0) / total_dt; mbps = ((double)total_bytes * 8.0) / (double)total_dt;
mbps_min = fmin(mbps_min, mbps); mbps_min = fmin(mbps_min, mbps);
mbps_max = fmax(mbps_max, mbps); mbps_max = fmax(mbps_max, mbps);
mbps_dlt = fabs(mbps_old - mbps); mbps_dlt = fabs(mbps_old - mbps);