openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File rr-glib-234.patch of Package rr (Revision 72e496ecb03dff9cedd674ee931209f6)

Currently displaying revision 72e496ecb03dff9cedd674ee931209f6 , Show latest

From d8b1db03360df84c4e369b2858a21dc6feee3213 Mon Sep 17 00:00:00 2001
From: Robert O'Callahan <robert@ocallahan.org>
Date: Mon, 16 May 2022 18:12:09 +1200
Subject: [PATCH] Handle __pthread_mutex_init being undefined at compile time
 (glib 2.34)

Resolves #2913
---
 src/preload/overrides.c | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/preload/overrides.c b/src/preload/overrides.c
index 2a3b868b6..1568f6882 100644
--- a/src/preload/overrides.c
+++ b/src/preload/overrides.c
@@ -44,8 +44,6 @@ static void fix_mutex_kind(pthread_mutex_t* mutex) {
   mutex->__data.__kind &= ~PTHREAD_MUTEX_PRIO_INHERIT_NP;
 }
 
-extern int __pthread_mutex_init(pthread_mutex_t* mutex,
-                                const pthread_mutexattr_t* attr);
 #ifdef DOUBLE_UNDERSCORE_PTHREAD_LOCK_AVAILABLE
 /*
  * We need to able to call directly to __pthread_mutex_lock and
@@ -55,6 +53,8 @@ extern int __pthread_mutex_init(pthread_mutex_t* mutex,
  * to use a pthreads-based implementation). So before our pointers are set
  * up, call these.
  */
+extern int __pthread_mutex_init(pthread_mutex_t* mutex,
+                                const pthread_mutexattr_t* attr);
 extern int __pthread_mutex_lock(pthread_mutex_t* mutex);
 extern int __pthread_mutex_trylock(pthread_mutex_t* mutex);
 #endif
@@ -64,25 +64,28 @@ int pthread_mutex_init(pthread_mutex_t* mutex,
   int ret;
   pthread_mutexattr_t realattr;
 
-  if (!attr) {
-    return __pthread_mutex_init(mutex, NULL);
-  }
-
-  /* We wish to enforce the use of plain (no PI) mutex to avoid
-   * needing to handle PI futex() operations.
-   * We also wish to ensure that pthread_mutexattr_getprotocol()
-   * still returns the requested protocol.
-   * So we copy the attribute and force PTHREAD_PRIO_NONE.
-   */
-  memcpy(&realattr, attr, sizeof(realattr));
-  ret = pthread_mutexattr_setprotocol(&realattr, PTHREAD_PRIO_NONE);
-  if (ret) {
-    return ret;
+  if (attr) {
+    /* We wish to enforce the use of plain (no PI) mutex to avoid
+     * needing to handle PI futex() operations.
+     * We also wish to ensure that pthread_mutexattr_getprotocol()
+     * still returns the requested protocol.
+     * So we copy the attribute and force PTHREAD_PRIO_NONE.
+     */
+    memcpy(&realattr, attr, sizeof(realattr));
+    ret = pthread_mutexattr_setprotocol(&realattr, PTHREAD_PRIO_NONE);
+    if (ret) {
+      return ret;
+    }
+    attr = &realattr;
   }
-  if (real_pthread_mutex_init) {
-    return real_pthread_mutex_init(mutex, &realattr);
+  if (!real_pthread_mutex_init) {
+#ifdef DOUBLE_UNDERSCORE_PTHREAD_LOCK_AVAILABLE
+    return __pthread_mutex_init(mutex, attr);
+#else
+    real_pthread_mutex_init = dlsym(RTLD_NEXT, "pthread_mutex_init");
+#endif
   }
-  return __pthread_mutex_init(mutex, &realattr);
+  return real_pthread_mutex_init(mutex, attr);
 }
 
 /* Prevent use of lock elision; Haswell's TSX/RTM features used by

Places

File rr-glib-234.patch of Package rr (Revision 72e496ecb03dff9cedd674ee931209f6)

Places