From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753107AbbEJHLX (ORCPT ); Sun, 10 May 2015 03:11:23 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44942 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753079AbbEJHLS (ORCPT ); Sun, 10 May 2015 03:11:18 -0400 Date: Sun, 10 May 2015 00:11:04 -0700 From: tip-bot for Davidlohr Bueso Message-ID: Cc: acme@redhat.com, dave@stgolabs.net, hpa@zytor.com, mingo@kernel.org, dbueso@suse.de, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, mingo@kernel.org, acme@redhat.com, dave@stgolabs.net, tglx@linutronix.de, linux-kernel@vger.kernel.org, dbueso@suse.de In-Reply-To: <1431110280-20231-2-git-send-email-dave@stgolabs.net> References: <1431110280-20231-2-git-send-email-dave@stgolabs.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bench futex: Handle spurious wakeups Git-Commit-ID: 598adc5c9c1cfd3f154f6d9df72b38eda63e306e X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 598adc5c9c1cfd3f154f6d9df72b38eda63e306e Gitweb: http://git.kernel.org/tip/598adc5c9c1cfd3f154f6d9df72b38eda63e306e Author: Davidlohr Bueso AuthorDate: Fri, 8 May 2015 11:38:00 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 May 2015 16:24:02 -0300 perf bench futex: Handle spurious wakeups Wrap futex_wait around a loop and catch for EINTR. Either a spurious wakeup occurred or a signal interrupted is, either way we need to block again. Signed-off-by: Davidlohr Bueso Cc: Davidlohr Bueso Link: http://lkml.kernel.org/r/1431110280-20231-2-git-send-email-dave@stgolabs.net Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/bench/futex-wake.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/perf/bench/futex-wake.c b/tools/perf/bench/futex-wake.c index 929f762..e5e41d3 100644 --- a/tools/perf/bench/futex-wake.c +++ b/tools/perf/bench/futex-wake.c @@ -60,7 +60,12 @@ static void *workerfn(void *arg __maybe_unused) pthread_cond_wait(&thread_worker, &thread_lock); pthread_mutex_unlock(&thread_lock); - futex_wait(&futex1, 0, NULL, futex_flag); + while (1) { + if (futex_wait(&futex1, 0, NULL, futex_flag) != EINTR) + break; + } + + pthread_exit(NULL); return NULL; }