Commit d9de84af authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Arnaldo Carvalho de Melo

perf bench futex: Use global --repeat option

This option is available through perf-bench, use it instead and free the
local option.
Signed-off-by: default avatarDavidlohr Bueso <davidlohr@hp.com>
Cc: Aswin Chandramouleeswaran <aswin@hp.com>
Cc: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1402942467-10671-6-git-send-email-davidlohr@hp.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b6f0629a
...@@ -29,13 +29,6 @@ static u_int32_t futex1 = 0, futex2 = 0; ...@@ -29,13 +29,6 @@ static u_int32_t futex1 = 0, futex2 = 0;
*/ */
static unsigned int nrequeue = 1; static unsigned int nrequeue = 1;
/*
* There can be significant variance from run to run,
* the more repeats, the more exact the overall avg and
* the better idea of the futex latency.
*/
static unsigned int repeat = 10;
static pthread_t *worker; static pthread_t *worker;
static bool done = 0, silent = 0; static bool done = 0, silent = 0;
static pthread_mutex_t thread_lock; static pthread_mutex_t thread_lock;
...@@ -46,7 +39,6 @@ static unsigned int ncpus, threads_starting, nthreads = 0; ...@@ -46,7 +39,6 @@ static unsigned int ncpus, threads_starting, nthreads = 0;
static const struct option options[] = { static const struct option options[] = {
OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"), OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"),
OPT_UINTEGER('q', "nrequeue", &nrequeue, "Specify amount of threads to requeue at once"), OPT_UINTEGER('q', "nrequeue", &nrequeue, "Specify amount of threads to requeue at once"),
OPT_UINTEGER('r', "repeat", &repeat, "Specify amount of times to repeat the run"),
OPT_BOOLEAN( 's', "silent", &silent, "Silent mode: do not display data/details"), OPT_BOOLEAN( 's', "silent", &silent, "Silent mode: do not display data/details"),
OPT_END() OPT_END()
}; };
...@@ -146,7 +138,7 @@ int bench_futex_requeue(int argc, const char **argv, ...@@ -146,7 +138,7 @@ int bench_futex_requeue(int argc, const char **argv,
pthread_cond_init(&thread_parent, NULL); pthread_cond_init(&thread_parent, NULL);
pthread_cond_init(&thread_worker, NULL); pthread_cond_init(&thread_worker, NULL);
for (j = 0; j < repeat && !done; j++) { for (j = 0; j < bench_repeat && !done; j++) {
unsigned int nrequeued = 0; unsigned int nrequeued = 0;
struct timeval start, end, runtime; struct timeval start, end, runtime;
......
...@@ -30,15 +30,8 @@ static u_int32_t futex1 = 0; ...@@ -30,15 +30,8 @@ static u_int32_t futex1 = 0;
*/ */
static unsigned int nwakes = 1; static unsigned int nwakes = 1;
/*
* There can be significant variance from run to run,
* the more repeats, the more exact the overall avg and
* the better idea of the futex latency.
*/
static unsigned int repeat = 10;
pthread_t *worker; pthread_t *worker;
static bool done = 0, silent = 0; static bool done = false, silent = false;
static pthread_mutex_t thread_lock; static pthread_mutex_t thread_lock;
static pthread_cond_t thread_parent, thread_worker; static pthread_cond_t thread_parent, thread_worker;
static struct stats waketime_stats, wakeup_stats; static struct stats waketime_stats, wakeup_stats;
...@@ -47,7 +40,6 @@ static unsigned int ncpus, threads_starting, nthreads = 0; ...@@ -47,7 +40,6 @@ static unsigned int ncpus, threads_starting, nthreads = 0;
static const struct option options[] = { static const struct option options[] = {
OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"), OPT_UINTEGER('t', "threads", &nthreads, "Specify amount of threads"),
OPT_UINTEGER('w', "nwakes", &nwakes, "Specify amount of threads to wake at once"), OPT_UINTEGER('w', "nwakes", &nwakes, "Specify amount of threads to wake at once"),
OPT_UINTEGER('r', "repeat", &repeat, "Specify amount of times to repeat the run"),
OPT_BOOLEAN( 's', "silent", &silent, "Silent mode: do not display data/details"), OPT_BOOLEAN( 's', "silent", &silent, "Silent mode: do not display data/details"),
OPT_END() OPT_END()
}; };
...@@ -149,7 +141,7 @@ int bench_futex_wake(int argc, const char **argv, ...@@ -149,7 +141,7 @@ int bench_futex_wake(int argc, const char **argv,
pthread_cond_init(&thread_parent, NULL); pthread_cond_init(&thread_parent, NULL);
pthread_cond_init(&thread_worker, NULL); pthread_cond_init(&thread_worker, NULL);
for (j = 0; j < repeat && !done; j++) { for (j = 0; j < bench_repeat && !done; j++) {
unsigned int nwoken = 0; unsigned int nwoken = 0;
struct timeval start, end, runtime; struct timeval start, end, runtime;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment