diff options
author | Lutz Donnerhacke <donner@FreeBSD.org> | 2021-05-23 12:43:00 +0000 |
---|---|---|
committer | Lutz Donnerhacke <donner@FreeBSD.org> | 2021-05-23 12:43:00 +0000 |
commit | ccac04cae538a625cbce224e4005360fa85e1b9d (patch) | |
tree | 26a28788531657dca58a42f3d7c6ece9243dd4aa | |
parent | ef0f7ae934b04a4f90e051d701ba539dd04e7d5b (diff) | |
download | src-ccac04cae538a625cbce224e4005360fa85e1b9d.tar.gz src-ccac04cae538a625cbce224e4005360fa85e1b9d.zip |
test/libalias: Fix build errors on various platforms
struct timeval has an unspecified integral type, which needs to be
canonfied before beeing usable by printf(3).
-rw-r--r-- | tests/sys/netinet/libalias/perf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/sys/netinet/libalias/perf.c b/tests/sys/netinet/libalias/perf.c index ac4796cf9649..fadbb439774a 100644 --- a/tests/sys/netinet/libalias/perf.c +++ b/tests/sys/netinet/libalias/perf.c @@ -15,7 +15,7 @@ static struct in_addr ext = { htonl(0x12000000) }; ? ((tv).tv_usec cmp (uv).tv_usec) \ : ((tv).tv_sec cmp (uv).tv_sec)) -#define timevaldiff(n, o) \ +#define timevaldiff(n, o) (float) \ (((n).tv_sec - (o).tv_sec)*1000000l + \ ((n).tv_usec - (o).tv_usec)) @@ -69,7 +69,7 @@ int main(int argc, char ** argv) gettimeofday(&timeout, NULL); timeout.tv_sec += max_seconds; - printf("RND SEC NAT RND ATT UNA\n"); + printf("RND SECND NAT RND ATT UNA\n"); for (round = 0; ; round++) { int i, res; struct timeval now, start; @@ -77,7 +77,7 @@ int main(int argc, char ** argv) printf("%3d ", round+1); gettimeofday(&start, NULL); - printf("%3ld ", max_seconds - (timeout.tv_sec - start.tv_sec)); + printf("%5.1f ", max_seconds - timevaldiff(timeout, start)/1000000.0f); for (cnt = i = 0; i < batch_size; i++, cnt++) { batch[i].src.s_addr = prv.s_addr | htonl(rand_range(0, 0xffff)); batch[i].dst.s_addr = ext.s_addr | htonl(rand_range(0, 0xffff)); @@ -104,7 +104,7 @@ int main(int argc, char ** argv) goto out; } if (cnt > 0) - printf("%3lu ", timevaldiff(now, start) / cnt); + printf("%3.0f ", timevaldiff(now, start) / cnt); start = now; for (cnt = i = 0; i < random_size; i++, cnt++) { @@ -125,7 +125,7 @@ int main(int argc, char ** argv) goto out; } if (cnt > 0) - printf("%3lu ", timevaldiff(now, start) / cnt); + printf("%3.0f ", timevaldiff(now, start) / cnt); start = now; p->ip_src.s_addr = ext.s_addr & htonl(0xfff00000); @@ -145,7 +145,7 @@ int main(int argc, char ** argv) goto out; } if (cnt > 0) - printf("%3lu ", timevaldiff(now, start) / cnt); + printf("%3.0f ", timevaldiff(now, start) / cnt); qsort(batch, batch_size, sizeof(*batch), randcmp); @@ -172,7 +172,7 @@ int main(int argc, char ** argv) goto out; } if (cnt > 0) - printf("%3lu\n", timevaldiff(now, start) / cnt); + printf("%3.0f\n", timevaldiff(now, start) / cnt); } out: printf("\n\n"); |