cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly print time_t.

Browse Source
This commit is contained in:
jca 2017-04-19 23:33:40 +00:00
parent 3afe8ed140
commit eb18ab224b
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
benchmarks/netperf/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2015/10/21 13:10:00 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2017/04/19 23:33:40 jca Exp $
COMMENT= network performance benchmark
DISTNAME= netperf-2.7.0
REVISION= 0
CATEGORIES= benchmarks net

48
benchmarks/netperf/patches/patch-src_netlib_c Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-src_netlib_c,v 1.3 2017/04/19 23:33:40 jca Exp $
--- src/netlib.c.orig Thu Apr 20 01:27:36 2017
+++ src/netlib.c Thu Apr 20 01:28:48 2017
@@ -4010,22 +4010,22 @@ __forceinline void demo_interval_display(double actual
switch (netperf_output_mode) {
case HUMAN:
fprintf(where,
- "Interim result: %7.2f %s/s over %.3f seconds ending at %ld.%.3ld\n",
+ "Interim result: %7.2f %s/s over %.3f seconds ending at %lld.%.3ld\n",
calc_thruput_interval(units_this_tick,
actual_interval/1000000.0),
format_units(),
actual_interval/1000000.0,
- now.tv_sec,
+ (long long) now.tv_sec,
(long) now.tv_usec/1000);
break;
case CSV:
fprintf(where,
- "%7.2f,%s/s,%.3f,%ld.%.3ld\n",
+ "%7.2f,%s/s,%.3f,%lld.%.3ld\n",
calc_thruput_interval(units_this_tick,
actual_interval/1000000.0),
format_units(),
actual_interval/1000000.0,
- now.tv_sec,
+ (long long) now.tv_sec,
(long) now.tv_usec/1000);
break;
case KEYVAL:
@@ -4033,7 +4033,7 @@ __forceinline void demo_interval_display(double actual
"NETPERF_INTERIM_RESULT[%d]=%.2f\n"
"NETPERF_UNITS[%d]=%s/s\n"
"NETPERF_INTERVAL[%d]=%.3f\n"
- "NETPERF_ENDING[%d]=%ld.%.3ld\n",
+ "NETPERF_ENDING[%d]=%lld.%.3ld\n",
count,
calc_thruput_interval(units_this_tick,
actual_interval/1000000.0),
@@ -4042,7 +4042,7 @@ __forceinline void demo_interval_display(double actual
count,
actual_interval/1000000.0,
count,
- now.tv_sec,
+ (long long) now.tv_sec,
(long) now.tv_usec/1000);
count += 1;
break;