Use portable variant of some pthread functions instead non-portable one (non-portable was needed for ancient glibc versions)

AlexPeshkoff · AlexPeshkoff · commit ec6c04ce4861 · 2025-07-24T20:31:53.000+03:00
(cherry picked from commit 00665ba)
diff --git a/configure.ac b/configure.ac
@@ -1167,9 +1167,9 @@ AC_CHECK_FUNCS(clock_gettime)
 
 dnl Checks for pthread functions
 AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
-AC_CHECK_FUNCS(pthread_mutexattr_setrobust_np)
-AC_CHECK_FUNCS(pthread_mutex_consistent_np)
-AC_CHECK_FUNCS(pthread_rwlockattr_setkind_np)
+AC_CHECK_FUNCS(pthread_mutexattr_setrobust)
+AC_CHECK_FUNCS(pthread_mutex_consistent)
+AC_CHECK_FUNCS(pthread_rwlockattr_setkind)
 AC_CHECK_FUNCS(pthread_cancel)
 AC_CHECK_FUNCS(pthread_atfork)
 AC_CHECK_FUNCS(sigset)
diff --git a/src/common/classes/rwlock.h b/src/common/classes/rwlock.h
@@ -209,12 +209,12 @@ class RWLock : public Reasons
 	void init()
 	{
 		int code;
-#if defined(LINUX) && !defined(USE_VALGRIND) && defined(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP)
+#if defined(LINUX) && !defined(USE_VALGRIND) && defined(HAVE_PTHREAD_RWLOCKATTR_SETKIND)
 		pthread_rwlockattr_t attr;
 		if ((code = pthread_rwlockattr_init(&attr)))
 			system_call_failed::raise("pthread_rwlockattr_init", code);
 		// Do not worry if target misses support for this option
-		pthread_rwlockattr_setkind_np(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+		pthread_rwlockattr_setkind(&attr, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE);
 		if ((code = pthread_rwlock_init(&lock, NULL)))
 			system_call_failed::raise("pthread_rwlock_init", code);
 		if ((code = pthread_rwlockattr_destroy(&attr)))
diff --git a/src/common/isc_s_proto.h b/src/common/isc_s_proto.h
@@ -55,7 +55,7 @@
 
 #ifdef UNIX
 
-#if defined(HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP) && defined(HAVE_PTHREAD_MUTEX_CONSISTENT_NP)
+#if defined(HAVE_PTHREAD_MUTEXATTR_SETROBUST) && defined(HAVE_PTHREAD_MUTEX_CONSISTENT)
 #define USE_ROBUST_MUTEX
 #endif // ROBUST mutex
 
diff --git a/src/common/isc_sync.cpp b/src/common/isc_sync.cpp
@@ -1428,7 +1428,7 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 				if (!bugFlag)
 				{
 #endif
-					LOG_PTHREAD_ERROR(pthread_mutexattr_setrobust_np(&mattr, PTHREAD_MUTEX_ROBUST_NP));
+					LOG_PTHREAD_ERROR(pthread_mutexattr_setrobust(&mattr, PTHREAD_MUTEX_ROBUST));
 #ifdef BUGGY_LINUX_MUTEX
 				}
 #endif
@@ -2753,7 +2753,7 @@ void SharedMemoryBase::mutexLock()
 	{
 		// We always perform check for dead process
 		// Therefore may safely mark mutex as recovered
-		LOG_PTHREAD_ERROR(pthread_mutex_consistent_np(sh_mem_mutex->mtx_mutex));
+		LOG_PTHREAD_ERROR(pthread_mutex_consistent(sh_mem_mutex->mtx_mutex));
 		state = 0;
 	}
 #endif
@@ -2781,7 +2781,7 @@ bool SharedMemoryBase::mutexLockCond()
 	{
 		// We always perform check for dead process
 		// Therefore may safely mark mutex as recovered
-		LOG_PTHREAD_ERROR(pthread_mutex_consistent_np(sh_mem_mutex->mtx_mutex));
+		LOG_PTHREAD_ERROR(pthread_mutex_consistent(sh_mem_mutex->mtx_mutex));
 		state = 0;
 	}
 #endif
diff --git a/src/include/cross/android.arm64 b/src/include/cross/android.arm64
@@ -299,14 +299,14 @@
 /* Define to 1 if you have the `pthread_mutexattr_setprotocol' function. */
 /* undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL */
 
-/* Define to 1 if you have the `pthread_mutexattr_setrobust_np' function. */
-/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP */
+/* Define to 1 if you have the `pthread_mutexattr_setrobust' function. */
+/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST */
 
-/* Define to 1 if you have the `pthread_mutex_consistent_np' function. */
-/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT_NP */
+/* Define to 1 if you have the `pthread_mutex_consistent' function. */
+/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT */
 
-/* Define to 1 if you have the `pthread_rwlockattr_setkind_np' function. */
-/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP */
+/* Define to 1 if you have the `pthread_rwlockattr_setkind' function. */
+/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND */
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
diff --git a/src/include/cross/android.arme b/src/include/cross/android.arme
@@ -305,14 +305,14 @@
 /* Define to 1 if you have the `pthread_mutexattr_setprotocol' function. */
 /* undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL */
 
-/* Define to 1 if you have the `pthread_mutexattr_setrobust_np' function. */
-/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP */
+/* Define to 1 if you have the `pthread_mutexattr_setrobust' function. */
+/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST */
 
-/* Define to 1 if you have the `pthread_mutex_consistent_np' function. */
-/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT_NP */
+/* Define to 1 if you have the `pthread_mutex_consistent' function. */
+/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT */
 
-/* Define to 1 if you have the `pthread_rwlockattr_setkind_np' function. */
-/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP */
+/* Define to 1 if you have the `pthread_rwlockattr_setkind' function. */
+/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND */
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
diff --git a/src/include/cross/android.x86 b/src/include/cross/android.x86
@@ -299,14 +299,14 @@
 /* Define to 1 if you have the `pthread_mutexattr_setprotocol' function. */
 /* undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL */
 
-/* Define to 1 if you have the `pthread_mutexattr_setrobust_np' function. */
-/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP */
+/* Define to 1 if you have the `pthread_mutexattr_setrobust' function. */
+/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST */
 
-/* Define to 1 if you have the `pthread_mutex_consistent_np' function. */
-/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT_NP */
+/* Define to 1 if you have the `pthread_mutex_consistent' function. */
+/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT */
 
-/* Define to 1 if you have the `pthread_rwlockattr_setkind_np' function. */
-/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP */
+/* Define to 1 if you have the `pthread_rwlockattr_setkind' function. */
+/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND */
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
diff --git a/src/include/cross/android.x86_64 b/src/include/cross/android.x86_64
@@ -299,14 +299,14 @@
 /* Define to 1 if you have the `pthread_mutexattr_setprotocol' function. */
 /* undef HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL */
 
-/* Define to 1 if you have the `pthread_mutexattr_setrobust_np' function. */
-/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP */
+/* Define to 1 if you have the `pthread_mutexattr_setrobust' function. */
+/* #undef HAVE_PTHREAD_MUTEXATTR_SETROBUST */
 
-/* Define to 1 if you have the `pthread_mutex_consistent_np' function. */
-/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT_NP */
+/* Define to 1 if you have the `pthread_mutex_consistent' function. */
+/* #undef HAVE_PTHREAD_MUTEX_CONSISTENT */
 
-/* Define to 1 if you have the `pthread_rwlockattr_setkind_np' function. */
-/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP */
+/* Define to 1 if you have the `pthread_rwlockattr_setkind' function. */
+/* #undef HAVE_PTHREAD_RWLOCKATTR_SETKIND */
 
 /* Define to 1 if you have the <pwd.h> header file. */
 #define HAVE_PWD_H 1
diff --git a/src/include/gen/autoconfig.h.in b/src/include/gen/autoconfig.h.in
@@ -481,14 +481,14 @@
 /* Define to 1 if you have the `pthread_mutexattr_setprotocol' function. */
 #cmakedefine HAVE_PTHREAD_MUTEXATTR_SETPROTOCOL 1
 
-/* Define to 1 if you have the `pthread_mutexattr_setrobust_np' function. */
-#cmakedefine HAVE_PTHREAD_MUTEXATTR_SETROBUST_NP 1
+/* Define to 1 if you have the `pthread_mutexattr_setrobust' function. */
+#cmakedefine HAVE_PTHREAD_MUTEXATTR_SETROBUST 1
 
-/* Define to 1 if you have the `pthread_mutex_consistent_np' function. */
-#cmakedefine HAVE_PTHREAD_MUTEX_CONSISTENT_NP 1
+/* Define to 1 if you have the `pthread_mutex_consistent' function. */
+#cmakedefine HAVE_PTHREAD_MUTEX_CONSISTENT 1
 
-/* Define to 1 if you have the `pthread_rwlockattr_setkind_np' function. */
-#cmakedefine HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP 1
+/* Define to 1 if you have the `pthread_rwlockattr_setkind' function. */
+#cmakedefine HAVE_PTHREAD_RWLOCKATTR_SETKIND 1
 
 /* Define to 1 if you have the `qsort_r' function. */
 #cmakedefine HAVE_QSORT_R 1

Original file line number	Diff line number	Diff line change
`@@ -1428,7 +1428,7 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject`
`1428`	`1428`	`if (!bugFlag)`
`1429`	`1429`	`{`
`1430`	`1430`	`#endif`
`1431`		`- LOG_PTHREAD_ERROR(pthread_mutexattr_setrobust_np(&mattr, PTHREAD_MUTEX_ROBUST_NP));`
	`1431`	`+ LOG_PTHREAD_ERROR(pthread_mutexattr_setrobust(&mattr, PTHREAD_MUTEX_ROBUST));`
`1432`	`1432`	`#ifdef BUGGY_LINUX_MUTEX`
`1433`	`1433`	`}`
`1434`	`1434`	`#endif`
`@@ -2753,7 +2753,7 @@ void SharedMemoryBase::mutexLock()`
`2753`	`2753`	`{`
`2754`	`2754`	`// We always perform check for dead process`
`2755`	`2755`	`// Therefore may safely mark mutex as recovered`
`2756`		`- LOG_PTHREAD_ERROR(pthread_mutex_consistent_np(sh_mem_mutex->mtx_mutex));`
	`2756`	`+ LOG_PTHREAD_ERROR(pthread_mutex_consistent(sh_mem_mutex->mtx_mutex));`
`2757`	`2757`	`state = 0;`
`2758`	`2758`	`}`
`2759`	`2759`	`#endif`
`@@ -2781,7 +2781,7 @@ bool SharedMemoryBase::mutexLockCond()`
`2781`	`2781`	`{`
`2782`	`2782`	`// We always perform check for dead process`
`2783`	`2783`	`// Therefore may safely mark mutex as recovered`
`2784`		`- LOG_PTHREAD_ERROR(pthread_mutex_consistent_np(sh_mem_mutex->mtx_mutex));`
	`2784`	`+ LOG_PTHREAD_ERROR(pthread_mutex_consistent(sh_mem_mutex->mtx_mutex));`
`2785`	`2785`	`state = 0;`
`2786`	`2786`	`}`
`2787`	`2787`	`#endif`