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

Commit 73b1794e authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Arnaldo Carvalho de Melo
Browse files

perf bench futex: Simplify wrapper for LOCK_PI 



Given that the 'val' parameter is ignored for FUTEX_LOCK_PI, get rid of
the bogus deadlock detection flag in the wrapper code and avoid the
extra argument, making it resemble its unlock counterpart. And if
nothing else, we already only pass 0 anyway.

Signed-off-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Cc: Davidlohr Bueso <dbueso@suse.de>
Link: http://lkml.kernel.org/r/1461208447-29328-1-git-send-email-dave@stgolabs.net


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

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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void *workerfn(void *arg) 
	do {

		int ret;

	again:

		ret = futex_lock_pi(w->futex, NULL, 0, futex_flag);

		ret = futex_lock_pi(w->futex, NULL, futex_flag);



		if (ret) { /* handle lock acquisition */

			if (!silent)

tools/perf/bench/futex.h

+2 −4
Original line number Diff line number Diff line
@@ -57,13 +57,11 @@ futex_wake(u_int32_t *uaddr, int nr_wake, int opflags) 


/**

 * futex_lock_pi() - block on uaddr as a PI mutex

 * @detect:	whether (1) or not (0) to perform deadlock detection

 */

static inline int

futex_lock_pi(u_int32_t *uaddr, struct timespec *timeout, int detect,

	      int opflags)

futex_lock_pi(u_int32_t *uaddr, struct timespec *timeout, int opflags)

{

	return futex(uaddr, FUTEX_LOCK_PI, detect, timeout, NULL, 0, opflags);

	return futex(uaddr, FUTEX_LOCK_PI, 0, timeout, NULL, 0, opflags);

}



/**