From: Bruno Haible <bruno@clisp.org>
Date: Fri, 9 Aug 2024 09:59:10 +0000 (+0200)
Subject: pthread-rwlock: Attempt to avoid test failure on some machines.
X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=b12e697b20b134ff7ca5cc268f7a54e0faffc62f;p=gnulib.git

pthread-rwlock: Attempt to avoid test failure on some machines.

Reported by Pádraig Brady <P@draigBrady.com> in
<https://lists.gnu.org/archive/html/bug-gnulib/2024-08/msg00050.html>.

* tests/test-pthread-rwlock-waitqueue.c (STEP_INTERVAL): Bump the
minimum interval to 10 ms.
* m4/pthread-rwlock.m4 (gl_PTHREAD_RWLOCK): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 38802e887d..c31e68d8ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-08-09  Bruno Haible  <bruno@clisp.org>
+
+	pthread-rwlock: Attempt to avoid test failure on some machines.
+	Reported by Pádraig Brady <P@draigBrady.com> in
+	<https://lists.gnu.org/archive/html/bug-gnulib/2024-08/msg00050.html>.
+	* tests/test-pthread-rwlock-waitqueue.c (STEP_INTERVAL): Bump the
+	minimum interval to 10 ms.
+	* m4/pthread-rwlock.m4 (gl_PTHREAD_RWLOCK): Likewise.
+
 2024-08-08  Bruno Haible  <bruno@clisp.org>
 
 	doc: Update for other functions added in POSIX:2024.
diff --git a/m4/pthread-rwlock.m4 b/m4/pthread-rwlock.m4
index cbd08790e1..0e203606a1 100644
--- a/m4/pthread-rwlock.m4
+++ b/m4/pthread-rwlock.m4
@@ -1,5 +1,5 @@
 # pthread-rwlock.m4
-# serial 6
+# serial 7
 dnl Copyright (C) 2019-2024 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -127,10 +127,8 @@ AC_DEFUN([gl_PTHREAD_RWLOCK],
 
 #if defined __hppa
 # define STEP_INTERVAL 20000000 /* nanoseconds */
-#elif defined __aarch64__ || defined __m68k__
-# define STEP_INTERVAL 10000000 /* nanoseconds */
 #else
-# define STEP_INTERVAL 5000000 /* nanoseconds */
+# define STEP_INTERVAL 10000000 /* nanoseconds */
 #endif
 
 static pthread_rwlock_t lock;
diff --git a/tests/test-pthread-rwlock-waitqueue.c b/tests/test-pthread-rwlock-waitqueue.c
index 9dc4a4e808..b7df033c90 100644
--- a/tests/test-pthread-rwlock-waitqueue.c
+++ b/tests/test-pthread-rwlock-waitqueue.c
@@ -55,11 +55,8 @@
 #elif (defined __FreeBSD__ || defined __DragonFly__) || (defined __linux__ && defined __hppa)
 /* FreeBSD, Linux/hppa */
 # define STEP_INTERVAL 20000000 /* nanoseconds */
-#elif defined __GNU__ || defined __sun || (defined __linux__ && (defined __aarch64__ || defined __m68k__))
-/* GNU/Hurd, Solaris, Linux/arm64, Linux/m68k */
-# define STEP_INTERVAL 10000000 /* nanoseconds */
 #else
-# define STEP_INTERVAL 5000000 /* nanoseconds */
+# define STEP_INTERVAL 10000000 /* nanoseconds */
 #endif
 
 static pthread_rwlock_t lock;