perf bench: Fix div-by-zero if runtime is zero
authorTommi Rantala <tommi.t.rantala@nokia.com>
Fri, 17 Apr 2020 13:23:29 +0000 (16:23 +0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 22 Apr 2020 13:01:33 +0000 (10:01 -0300)
Fix div-by-zero if runtime is zero:

  $ perf bench futex hash --runtime=0
  # Running 'futex/hash' benchmark:
  Run summary [PID 12090]: 4 threads, each operating on 1024 [private] futexes for 0 secs.
  Floating point exception (core dumped)

Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lore.kernel.org/lkml/20200417132330.119407-4-tommi.t.rantala@nokia.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/bench/epoll-wait.c
tools/perf/bench/futex-hash.c
tools/perf/bench/futex-lock-pi.c

index f938c58..cf79736 100644 (file)
@@ -519,7 +519,8 @@ int bench_epoll_wait(int argc, const char **argv)
                qsort(worker, nthreads, sizeof(struct worker), cmpworker);
 
        for (i = 0; i < nthreads; i++) {
-               unsigned long t = worker[i].ops / bench__runtime.tv_sec;
+               unsigned long t = bench__runtime.tv_sec > 0 ?
+                       worker[i].ops / bench__runtime.tv_sec : 0;
 
                update_stats(&throughput_stats, t);
 
index 65eebe0..915bf3d 100644 (file)
@@ -205,7 +205,8 @@ int bench_futex_hash(int argc, const char **argv)
        pthread_mutex_destroy(&thread_lock);
 
        for (i = 0; i < nthreads; i++) {
-               unsigned long t = worker[i].ops / bench__runtime.tv_sec;
+               unsigned long t = bench__runtime.tv_sec > 0 ?
+                       worker[i].ops / bench__runtime.tv_sec : 0;
                update_stats(&throughput_stats, t);
                if (!silent) {
                        if (nfutexes == 1)
index 89fd8f3..bb25d8b 100644 (file)
@@ -211,7 +211,8 @@ int bench_futex_lock_pi(int argc, const char **argv)
        pthread_mutex_destroy(&thread_lock);
 
        for (i = 0; i < nthreads; i++) {
-               unsigned long t = worker[i].ops / bench__runtime.tv_sec;
+               unsigned long t = bench__runtime.tv_sec > 0 ?
+                       worker[i].ops / bench__runtime.tv_sec : 0;
 
                update_stats(&throughput_stats, t);
                if (!silent)