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: Davidlohr 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Davidlohr Bueso 2016-04-20 20:14:07 -07:00 committed by Arnaldo Carvalho de Melo
parent 8daef508b0
commit 73b1794e25
2 changed files with 3 additions and 5 deletions

View File

@ -83,7 +83,7 @@ static void *workerfn(void *arg)
do { do {
int ret; int ret;
again: 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 (ret) { /* handle lock acquisition */
if (!silent) if (!silent)

View File

@ -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 * futex_lock_pi() - block on uaddr as a PI mutex
* @detect: whether (1) or not (0) to perform deadlock detection
*/ */
static inline int static inline int
futex_lock_pi(u_int32_t *uaddr, struct timespec *timeout, int detect, futex_lock_pi(u_int32_t *uaddr, struct timespec *timeout, int opflags)
int opflags)
{ {
return futex(uaddr, FUTEX_LOCK_PI, detect, timeout, NULL, 0, opflags); return futex(uaddr, FUTEX_LOCK_PI, 0, timeout, NULL, 0, opflags);
} }
/** /**