Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1383850 > unrolled thread
| Started by | Davidlohr Bueso <dave@stgolabs.net> |
|---|---|
| First post | 2016-04-21 05:20 +0200 |
| Last post | 2016-04-27 17:40 +0200 |
| Articles | 3 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] perf/bench-futex: Simplify wrapper for LOCK_PI Davidlohr Bueso <dave@stgolabs.net> - 2016-04-21 05:20 +0200
Re: [PATCH] perf/bench-futex: Simplify wrapper for LOCK_PI Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-26 01:30 +0200
[tip:perf/core] perf bench futex: Simplify wrapper for LOCK_PI tip-bot for Davidlohr Bueso <tipbot@zytor.com> - 2016-04-27 17:40 +0200
| From | Davidlohr Bueso <dave@stgolabs.net> |
|---|---|
| Date | 2016-04-21 05:20 +0200 |
| Subject | [PATCH] perf/bench-futex: Simplify wrapper for LOCK_PI |
| Message-ID | <rqdjP-27E-3@gated-at.bofh.it> |
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>
---
tools/perf/bench/futex-lock-pi.c | 2 +-
tools/perf/bench/futex.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c
index 6a18ce21f865..6952db65508a 100644
--- a/tools/perf/bench/futex-lock-pi.c
+++ b/tools/perf/bench/futex-lock-pi.c
@@ -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)
diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h
index aca900fdc788..f0501edba0e7 100644
--- a/tools/perf/bench/futex.h
+++ b/tools/perf/bench/futex.h
@@ -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);
}
/**
--
2.8.1
[toc] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2016-04-26 01:30 +0200 |
| Message-ID | <rrY71-5UY-23@gated-at.bofh.it> |
| In reply to | #1383850 |
Em Wed, Apr 20, 2016 at 08:14:07PM -0700, Davidlohr Bueso escreveu: > 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. Thanks, applied. - Arnaldo
[toc] | [prev] | [next] | [standalone]
| From | tip-bot for Davidlohr Bueso <tipbot@zytor.com> |
|---|---|
| Date | 2016-04-27 17:40 +0200 |
| Subject | [tip:perf/core] perf bench futex: Simplify wrapper for LOCK_PI |
| Message-ID | <rszJi-3tA-71@gated-at.bofh.it> |
| In reply to | #1383850 |
Commit-ID: 73b1794e252b0476cc6e46461c7612cbaa88be45
Gitweb: http://git.kernel.org/tip/73b1794e252b0476cc6e46461c7612cbaa88be45
Author: Davidlohr Bueso <dave@stgolabs.net>
AuthorDate: Wed, 20 Apr 2016 20:14:07 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 25 Apr 2016 20:24:26 -0300
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>
---
tools/perf/bench/futex-lock-pi.c | 2 +-
tools/perf/bench/futex.h | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tools/perf/bench/futex-lock-pi.c b/tools/perf/bench/futex-lock-pi.c
index 6a18ce2..6952db6 100644
--- a/tools/perf/bench/futex-lock-pi.c
+++ b/tools/perf/bench/futex-lock-pi.c
@@ -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)
diff --git a/tools/perf/bench/futex.h b/tools/perf/bench/futex.h
index d44de9f..b2e06d1 100644
--- a/tools/perf/bench/futex.h
+++ b/tools/perf/bench/futex.h
@@ -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);
}
/**
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web