fzsync: break inf loop with flag vs pthread_cancel
Hi, I'm working to get fzsync working with the Android kernel, which
does not have pthread_cancel available.
In the absence of pthread_cancel, when thread A exits due to a break,
thread B will get stuck in an infinite loop while waiting for thread A
to progress.
Instead of cancelling thread B, we can use the exit flag to break out of
thread B's loop. This should also remove the need for the wrapper
around the thread.
Test: none
Signed-off-by: Edward Liaw <edliaw@google.com>
Reviewed-by: Li Wang <liwang@redhat.com>
Reviewed-by: Richard Palethorpe <rpalethorpe@suse.com>
Change-Id: I4c970a723c81a6b13eaf0776d5b5cc32e847a9e4
diff --git a/include/tst_fuzzy_sync.h b/include/tst_fuzzy_sync.h
index 0212684..4f09ed4 100644
--- a/include/tst_fuzzy_sync.h
+++ b/include/tst_fuzzy_sync.h
@@ -240,25 +240,6 @@
}
}
-/** To store the run_b pointer and pass to tst_fzsync_thread_wrapper */
-struct tst_fzsync_run_thread {
- void *(*func)(void *);
- void *arg;
-};
-
-/**
- * Wrap run_b for tst_fzsync_pair_reset to enable pthread cancel
- * at the start of the thread B.
- */
-static inline void *tst_fzsync_thread_wrapper(void *run_thread)
-{
- struct tst_fzsync_run_thread t = *(struct tst_fzsync_run_thread *)run_thread;
-
- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
- pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
- return t.func(t.arg);
-}
-
/**
* Zero some stat fields
*
