The macro definitions of the following pthread functions return incorrect values from the inner function return code.
while pthread_barrier_init, pthread_barrier_destroy and pthread_cancel return 0 in a case of success and non zero (errno) value otherwise the shimming functions InitializeSynchronizationBarrier, DeleteSynchronizationBarrier and TerminateThread return FALSE (0) in a case of failure and TRUE(1) in a case of success. This issue was undetected as none of the functions return codes was checked until such check was added in commit 34cc55cce6b1 ("eal: fix race in control thread creation") exposing the issue by failing pthread_barrier_init and rte_eal_init on Windows as a result. The fix aligned the return value of the 3 function with the expected pthread API return values. Fixes: e8428a9d89f1 ("eal/windows: add some basic functions and macros") Fixes: 34cc55cce6b1 ("eal: fix race in control thread creation") Cc: sta...@dpdk.org Signed-off-by: Tal Shnaiderman <tal...@nvidia.com> --- lib/librte_eal/windows/include/pthread.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/windows/include/pthread.h b/lib/librte_eal/windows/include/pthread.h index 9aeab1fa70..1939b0121c 100644 --- a/lib/librte_eal/windows/include/pthread.h +++ b/lib/librte_eal/windows/include/pthread.h @@ -35,12 +35,12 @@ typedef CRITICAL_SECTION pthread_mutex_t; typedef SYNCHRONIZATION_BARRIER pthread_barrier_t; #define pthread_barrier_init(barrier, attr, count) \ - InitializeSynchronizationBarrier(barrier, count, -1) + !InitializeSynchronizationBarrier(barrier, count, -1) #define pthread_barrier_wait(barrier) EnterSynchronizationBarrier(barrier, \ SYNCHRONIZATION_BARRIER_FLAGS_BLOCK_ONLY) #define pthread_barrier_destroy(barrier) \ - DeleteSynchronizationBarrier(barrier) -#define pthread_cancel(thread) TerminateThread((HANDLE) thread, 0) + !DeleteSynchronizationBarrier(barrier) +#define pthread_cancel(thread) !TerminateThread((HANDLE) thread, 0) /* pthread function overrides */ #define pthread_self() \ -- 2.16.1.windows.4