summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/torture/nbench/nbio.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index fee3af05e4..8a9c36f1d0 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -73,16 +73,25 @@ void nb_alarm(void)
t = end_timer();
- printf("%4d %8d %.2f MB/sec time %.0f sec \r",
- num_clients, lines/nprocs,
- 1.0e-6 * nbio_total() / t,
- t - warmup);
+ if (warmup) {
+ printf("%4d %8d %.2f MB/sec warmup %.0f sec \r",
+ num_clients, lines/nprocs,
+ 1.0e-6 * nbio_total() / t,
+ t);
+ } else {
+ printf("%4d %8d %.2f MB/sec execute %.0f sec \r",
+ num_clients, lines/nprocs,
+ 1.0e-6 * nbio_total() / t,
+ t);
+ }
if (warmup && t >= warmup) {
start_timer();
warmup = 0;
}
+ fflush(stdout);
+
signal(SIGALRM, nb_alarm);
alarm(1);
}