perf bench futex, requeue: Robustify futex_wait() handling

[sfrench/cifs-2.6.git] / tools / perf / bench / futex-requeue.c

diff --git a/tools/perf/bench/futex-requeue.c b/tools/perf/bench/futex-requeue.c
index 6606569e7ccc38267816f5cfac7f2b33ce37f078..e23a08037de2849a29819a64c6390f420e463153 100644 (file)
--- a/tools/perf/bench/futex-requeue.c
+++ b/tools/perf/bench/futex-requeue.c
@@ -77,6 +77,8 @@ static void print_summary(void)
 
 static void *workerfn(void *arg __maybe_unused)
 {
+       int ret;
+
        pthread_mutex_lock(&thread_lock);
        threads_starting--;
        if (!threads_starting)
@@ -84,7 +86,18 @@ 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) {
+               ret = futex_wait(&futex1, 0, NULL, futex_flag);
+               if (!ret)
+                       break;
+
+               if (ret && errno != EAGAIN) {
+                       if (!params.silent)
+                               warn("futex_wait");
+                       break;
+               }
+       }
+
        return NULL;
 }