Commit a64d3af5 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf bench: Update use of pthread mutex/cond 



Switch to the use of mutex wrappers that provide better error checking.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Truong <alexandre.truong@arm.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: André Almeida <andrealmeid@igalia.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Colin Ian King <colin.king@intel.com>
Cc: Dario Petrillo <dario.pk1@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Dave Marchevsky <davemarchevsky@fb.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Fangrui Song <maskray@google.com>
Cc: Hewenliang <hewenliang4@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jason Wang <wangborong@cdjrlc.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin Liška <mliska@suse.cz>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Pavithra Gurushankar <gpavithrasha@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Remi Bernon <rbernon@codeweavers.com>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tom Rix <trix@redhat.com>
Cc: Weiguo Li <liwg06@foxmail.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: William Cohen <wcohen@redhat.com>
Cc: Zechuan Chen <chenzechuan1@huawei.com>
Cc: bpf@vger.kernel.org
Cc: llvm@lists.linux.dev
Cc: yaowenbin <yaowenbin1@huawei.com>
Link: https://lore.kernel.org/r/20220826164242.43412-3-irogers@google.com


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

tools/perf/bench/epoll-ctl.c

+17 −16
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <sys/eventfd.h>

#include <perf/cpumap.h>



#include "../util/mutex.h"

#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include "bench.h"
@@ -58,10 +59,10 @@ static unsigned int nested = 0; 
/* amount of fds to monitor, per thread */

static unsigned int nfds = 64;



static pthread_mutex_t thread_lock;

static struct mutex thread_lock;

static unsigned int threads_starting;

static struct stats all_stats[EPOLL_NR_OPS];

static pthread_cond_t thread_parent, thread_worker;

static struct cond thread_parent, thread_worker;



struct worker {

	int tid;
@@ -174,12 +175,12 @@ static void *workerfn(void *arg) 
	struct timespec ts = { .tv_sec = 0,

			       .tv_nsec = 250 };



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	threads_starting--;

	if (!threads_starting)

		pthread_cond_signal(&thread_parent);

	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);

		cond_signal(&thread_parent);

	cond_wait(&thread_worker, &thread_lock);

	mutex_unlock(&thread_lock);



	/* Let 'em loose */

	do {
@@ -367,9 +368,9 @@ int bench_epoll_ctl(int argc, const char **argv) 
	for (i = 0; i < EPOLL_NR_OPS; i++)

		init_stats(&all_stats[i]);



	pthread_mutex_init(&thread_lock, NULL);

	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);

	mutex_init(&thread_lock);

	cond_init(&thread_parent);

	cond_init(&thread_worker);



	threads_starting = nthreads;
@@ -377,11 +378,11 @@ int bench_epoll_ctl(int argc, const char **argv) 


	do_threads(worker, cpu);



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	while (threads_starting)

		pthread_cond_wait(&thread_parent, &thread_lock);

	pthread_cond_broadcast(&thread_worker);

	pthread_mutex_unlock(&thread_lock);

		cond_wait(&thread_parent, &thread_lock);

	cond_broadcast(&thread_worker);

	mutex_unlock(&thread_lock);



	sleep(nsecs);

	toggle_done(0, NULL, NULL);
@@ -394,9 +395,9 @@ int bench_epoll_ctl(int argc, const char **argv) 
	}



	/* cleanup & report results */

	pthread_cond_destroy(&thread_parent);

	pthread_cond_destroy(&thread_worker);

	pthread_mutex_destroy(&thread_lock);

	cond_destroy(&thread_parent);

	cond_destroy(&thread_worker);

	mutex_destroy(&thread_lock);



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

		unsigned long t[EPOLL_NR_OPS];

tools/perf/bench/epoll-wait.c

+17 −16
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
#include <perf/cpumap.h>



#include "../util/stat.h"

#include "../util/mutex.h"

#include <subcmd/parse-options.h>

#include "bench.h"
@@ -109,10 +110,10 @@ static bool multiq; /* use an epoll instance per thread */ 
/* amount of fds to monitor, per thread */

static unsigned int nfds = 64;



static pthread_mutex_t thread_lock;

static struct mutex thread_lock;

static unsigned int threads_starting;

static struct stats throughput_stats;

static pthread_cond_t thread_parent, thread_worker;

static struct cond thread_parent, thread_worker;



struct worker {

	int tid;
@@ -189,12 +190,12 @@ static void *workerfn(void *arg) 
	int to = nonblocking? 0 : -1;

	int efd = multiq ? w->epollfd : epollfd;



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	threads_starting--;

	if (!threads_starting)

		pthread_cond_signal(&thread_parent);

	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);

		cond_signal(&thread_parent);

	cond_wait(&thread_worker, &thread_lock);

	mutex_unlock(&thread_lock);



	do {

		/*
@@ -485,9 +486,9 @@ int bench_epoll_wait(int argc, const char **argv) 
	       getpid(), nthreads, oneshot ? " (EPOLLONESHOT semantics)": "", nfds, nsecs);



	init_stats(&throughput_stats);

	pthread_mutex_init(&thread_lock, NULL);

	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);

	mutex_init(&thread_lock);

	cond_init(&thread_parent);

	cond_init(&thread_worker);



	threads_starting = nthreads;
@@ -495,11 +496,11 @@ int bench_epoll_wait(int argc, const char **argv) 


	do_threads(worker, cpu);



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	while (threads_starting)

		pthread_cond_wait(&thread_parent, &thread_lock);

	pthread_cond_broadcast(&thread_worker);

	pthread_mutex_unlock(&thread_lock);

		cond_wait(&thread_parent, &thread_lock);

	cond_broadcast(&thread_worker);

	mutex_unlock(&thread_lock);



	/*

	 * At this point the workers should be blocked waiting for read events
@@ -522,9 +523,9 @@ int bench_epoll_wait(int argc, const char **argv) 
		err(EXIT_FAILURE, "pthread_join");



	/* cleanup & report results */

	pthread_cond_destroy(&thread_parent);

	pthread_cond_destroy(&thread_worker);

	pthread_mutex_destroy(&thread_lock);

	cond_destroy(&thread_parent);

	cond_destroy(&thread_worker);

	mutex_destroy(&thread_lock);



	/* sort the array back before reporting */

	if (randomize)

tools/perf/bench/futex-hash.c

+17 −16
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <sys/mman.h>

#include <perf/cpumap.h>



#include "../util/mutex.h"

#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include "bench.h"
@@ -34,10 +35,10 @@ static bool done = false; 
static int futex_flag = 0;



struct timeval bench__start, bench__end, bench__runtime;

static pthread_mutex_t thread_lock;

static struct mutex thread_lock;

static unsigned int threads_starting;

static struct stats throughput_stats;

static pthread_cond_t thread_parent, thread_worker;

static struct cond thread_parent, thread_worker;



struct worker {

	int tid;
@@ -73,12 +74,12 @@ static void *workerfn(void *arg) 
	unsigned int i;

	unsigned long ops = w->ops; /* avoid cacheline bouncing */



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	threads_starting--;

	if (!threads_starting)

		pthread_cond_signal(&thread_parent);

	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);

		cond_signal(&thread_parent);

	cond_wait(&thread_worker, &thread_lock);

	mutex_unlock(&thread_lock);



	do {

		for (i = 0; i < params.nfutexes; i++, ops++) {
@@ -165,9 +166,9 @@ int bench_futex_hash(int argc, const char **argv) 
	       getpid(), params.nthreads, params.nfutexes, params.fshared ? "shared":"private", params.runtime);



	init_stats(&throughput_stats);

	pthread_mutex_init(&thread_lock, NULL);

	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);

	mutex_init(&thread_lock);

	cond_init(&thread_parent);

	cond_init(&thread_worker);



	threads_starting = params.nthreads;

	pthread_attr_init(&thread_attr);
@@ -203,11 +204,11 @@ int bench_futex_hash(int argc, const char **argv) 
	CPU_FREE(cpuset);

	pthread_attr_destroy(&thread_attr);



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	while (threads_starting)

		pthread_cond_wait(&thread_parent, &thread_lock);

	pthread_cond_broadcast(&thread_worker);

	pthread_mutex_unlock(&thread_lock);

		cond_wait(&thread_parent, &thread_lock);

	cond_broadcast(&thread_worker);

	mutex_unlock(&thread_lock);



	sleep(params.runtime);

	toggle_done(0, NULL, NULL);
@@ -219,9 +220,9 @@ int bench_futex_hash(int argc, const char **argv) 
	}



	/* cleanup & report results */

	pthread_cond_destroy(&thread_parent);

	pthread_cond_destroy(&thread_worker);

	pthread_mutex_destroy(&thread_lock);

	cond_destroy(&thread_parent);

	cond_destroy(&thread_worker);

	mutex_destroy(&thread_lock);



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

		unsigned long t = bench__runtime.tv_sec > 0 ?

tools/perf/bench/futex-lock-pi.c

+17 −16
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <pthread.h>



#include <signal.h>

#include "../util/mutex.h"

#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include <linux/compiler.h>
@@ -34,10 +35,10 @@ static u_int32_t global_futex = 0; 
static struct worker *worker;

static bool done = false;

static int futex_flag = 0;

static pthread_mutex_t thread_lock;

static struct mutex thread_lock;

static unsigned int threads_starting;

static struct stats throughput_stats;

static pthread_cond_t thread_parent, thread_worker;

static struct cond thread_parent, thread_worker;



static struct bench_futex_parameters params = {

	.runtime  = 10,
@@ -83,12 +84,12 @@ static void *workerfn(void *arg) 
	struct worker *w = (struct worker *) arg;

	unsigned long ops = w->ops;



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	threads_starting--;

	if (!threads_starting)

		pthread_cond_signal(&thread_parent);

	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);

		cond_signal(&thread_parent);

	cond_wait(&thread_worker, &thread_lock);

	mutex_unlock(&thread_lock);



	do {

		int ret;
@@ -197,9 +198,9 @@ int bench_futex_lock_pi(int argc, const char **argv) 
	       getpid(), params.nthreads, params.runtime);



	init_stats(&throughput_stats);

	pthread_mutex_init(&thread_lock, NULL);

	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);

	mutex_init(&thread_lock);

	cond_init(&thread_parent);

	cond_init(&thread_worker);



	threads_starting = params.nthreads;

	pthread_attr_init(&thread_attr);
@@ -208,11 +209,11 @@ int bench_futex_lock_pi(int argc, const char **argv) 
	create_threads(worker, thread_attr, cpu);

	pthread_attr_destroy(&thread_attr);



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	while (threads_starting)

		pthread_cond_wait(&thread_parent, &thread_lock);

	pthread_cond_broadcast(&thread_worker);

	pthread_mutex_unlock(&thread_lock);

		cond_wait(&thread_parent, &thread_lock);

	cond_broadcast(&thread_worker);

	mutex_unlock(&thread_lock);



	sleep(params.runtime);

	toggle_done(0, NULL, NULL);
@@ -224,9 +225,9 @@ int bench_futex_lock_pi(int argc, const char **argv) 
	}



	/* cleanup & report results */

	pthread_cond_destroy(&thread_parent);

	pthread_cond_destroy(&thread_worker);

	pthread_mutex_destroy(&thread_lock);

	cond_destroy(&thread_parent);

	cond_destroy(&thread_worker);

	mutex_destroy(&thread_lock);



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

		unsigned long t = bench__runtime.tv_sec > 0 ?

tools/perf/bench/futex-requeue.c

+17 −16
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <pthread.h>



#include <signal.h>

#include "../util/mutex.h"

#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include <linux/compiler.h>
@@ -34,8 +35,8 @@ static u_int32_t futex1 = 0, futex2 = 0; 


static pthread_t *worker;

static bool done = false;

static pthread_mutex_t thread_lock;

static pthread_cond_t thread_parent, thread_worker;

static struct mutex thread_lock;

static struct cond thread_parent, thread_worker;

static struct stats requeuetime_stats, requeued_stats;

static unsigned int threads_starting;

static int futex_flag = 0;
@@ -82,12 +83,12 @@ static void *workerfn(void *arg __maybe_unused) 
{

	int ret;



	pthread_mutex_lock(&thread_lock);

	mutex_lock(&thread_lock);

	threads_starting--;

	if (!threads_starting)

		pthread_cond_signal(&thread_parent);

	pthread_cond_wait(&thread_worker, &thread_lock);

	pthread_mutex_unlock(&thread_lock);

		cond_signal(&thread_parent);

	cond_wait(&thread_worker, &thread_lock);

	mutex_unlock(&thread_lock);



	while (1) {

		if (!params.pi) {
@@ -209,9 +210,9 @@ int bench_futex_requeue(int argc, const char **argv) 
	init_stats(&requeued_stats);

	init_stats(&requeuetime_stats);

	pthread_attr_init(&thread_attr);

	pthread_mutex_init(&thread_lock, NULL);

	pthread_cond_init(&thread_parent, NULL);

	pthread_cond_init(&thread_worker, NULL);

	mutex_init(&thread_lock);

	cond_init(&thread_parent);

	cond_init(&thread_worker);



	for (j = 0; j < bench_repeat && !done; j++) {

		unsigned int nrequeued = 0, wakeups = 0;
@@ -221,11 +222,11 @@ int bench_futex_requeue(int argc, const char **argv) 
		block_threads(worker, thread_attr, cpu);



		/* make sure all threads are already blocked */

		pthread_mutex_lock(&thread_lock);

		mutex_lock(&thread_lock);

		while (threads_starting)

			pthread_cond_wait(&thread_parent, &thread_lock);

		pthread_cond_broadcast(&thread_worker);

		pthread_mutex_unlock(&thread_lock);

			cond_wait(&thread_parent, &thread_lock);

		cond_broadcast(&thread_worker);

		mutex_unlock(&thread_lock);



		usleep(100000);
@@ -297,9 +298,9 @@ int bench_futex_requeue(int argc, const char **argv) 
	}



	/* cleanup & report results */

	pthread_cond_destroy(&thread_parent);

	pthread_cond_destroy(&thread_worker);

	pthread_mutex_destroy(&thread_lock);

	cond_destroy(&thread_parent);

	cond_destroy(&thread_worker);

	mutex_destroy(&thread_lock);

	pthread_attr_destroy(&thread_attr);



	print_summary();