Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 565e6911 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf bench futex: Use NSEC_PER_USEC 

Following kernel practices and better documentin

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-xncwqxegjp13g2nxih3lp9mx@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c05a6e14

tools/perf/bench/futex-requeue.c

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <subcmd/parse-options.h>

#include <linux/compiler.h>

#include <linux/kernel.h>

#include <linux/time64.h>

#include <errno.h>

#include "bench.h"

#include "futex.h"
@@ -62,7 +63,7 @@ static void print_summary(void) 
	printf("Requeued %d of %d threads in %.4f ms (+-%.2f%%)\n",

	       requeued_avg,

	       nthreads,

	       requeuetime_avg/1e3,

	       requeuetime_avg / USEC_PER_MSEC,

	       rel_stddev_stats(requeuetime_stddev, requeuetime_avg));

}
@@ -184,7 +185,7 @@ int bench_futex_requeue(int argc, const char **argv, 


		if (!silent) {

			printf("[Run %d]: Requeued %d of %d threads in %.4f ms\n",

			       j + 1, nrequeued, nthreads, runtime.tv_usec/1e3);

			       j + 1, nrequeued, nthreads, runtime.tv_usec / (double)USEC_PER_MSEC);

		}



		/* everybody should be blocked on futex2, wake'em up */

tools/perf/bench/futex-wake-parallel.c

+3 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <subcmd/parse-options.h>

#include <linux/compiler.h>

#include <linux/kernel.h>

#include <linux/time64.h>

#include <errno.h>

#include "bench.h"

#include "futex.h"
@@ -156,7 +157,7 @@ static void print_run(struct thread_data *waking_worker, unsigned int run_num) 


	printf("[Run %d]: Avg per-thread latency (waking %d/%d threads) "

	       "in %.4f ms (+-%.2f%%)\n", run_num + 1, wakeup_avg,

	       nblocked_threads, waketime_avg/1e3,

	       nblocked_threads, waketime_avg / USEC_PER_MSEC,

	       rel_stddev_stats(waketime_stddev, waketime_avg));

}
@@ -172,7 +173,7 @@ static void print_summary(void) 
	printf("Avg per-thread latency (waking %d/%d threads) in %.4f ms (+-%.2f%%)\n",

	       wakeup_avg,

	       nblocked_threads,

	       waketime_avg/1e3,

	       waketime_avg / USEC_PER_MSEC,

	       rel_stddev_stats(waketime_stddev, waketime_avg));

}

tools/perf/bench/futex-wake.c

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <subcmd/parse-options.h>

#include <linux/compiler.h>

#include <linux/kernel.h>

#include <linux/time64.h>

#include <errno.h>

#include "bench.h"

#include "futex.h"
@@ -81,7 +82,7 @@ static void print_summary(void) 
	printf("Wokeup %d of %d threads in %.4f ms (+-%.2f%%)\n",

	       wakeup_avg,

	       nthreads,

	       waketime_avg/1e3,

	       waketime_avg / USEC_PER_MSEC,

	       rel_stddev_stats(waketime_stddev, waketime_avg));

}
@@ -182,7 +183,7 @@ int bench_futex_wake(int argc, const char **argv, 


		if (!silent) {

			printf("[Run %d]: Wokeup %d of %d threads in %.4f ms\n",

			       j + 1, nwoken, nthreads, runtime.tv_usec/1e3);

			       j + 1, nwoken, nthreads, runtime.tv_usec / (double)USEC_PER_MSEC);

		}



		for (i = 0; i < nthreads; i++) {