From 7408d58714e3235f58c4d7eba42207c83b55e6bd Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Mon, 29 Jul 2024 15:17:07 -0400 Subject: [PATCH] disable rwlocks on nonstop klt model It appears nonstops new threading model defines some level of rwlock pthread api, but its not working properly. Disable rwlocks for _KLT_MODEL_ for now Reviewed-by: Tomas Mraz Reviewed-by: Tom Cosgrove (Merged from https://github.com/openssl/openssl/pull/24969) --- crypto/threads_pthread.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crypto/threads_pthread.c b/crypto/threads_pthread.c index 86943ba433674..b44559e373ae8 100644 --- a/crypto/threads_pthread.c +++ b/crypto/threads_pthread.c @@ -59,7 +59,11 @@ __tsan_mutex_post_lock((x), 0, 0) # include -# ifdef PTHREAD_RWLOCK_INITIALIZER +/* + * The Non-Stop KLT thread model currently seems broken in its rwlock + * implementation + */ +# if defined(PTHREAD_RWLOCK_INITIALIZER) && !defined(_KLT_MODEL_) # define USE_RWLOCK # endif