CVS commit: [netbsd-9] src/tests/lib/libc/sys

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue Oct 15 18:40:02 UTC 2019

Modified Files:
        src/tests/lib/libc/sys [netbsd-9]: t_ptrace_wait.c

Log Message:
Pull up following revision(s) (requested by kamil in ticket #314):

        tests/lib/libc/sys/t_ptrace_wait.c: revision 1.137

Fix race in t_ptrace_wait* LWP tests

Increment the done variable under a mutex. This variable was updated
non-atomically and sometimes not reaching the expected treshold.


To generate a diff of this commit:
cvs rdiff -u -r1.131.2.2 -r1.131.2.3 src/tests/lib/libc/sys/t_ptrace_wait.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.131.2.2 src/tests/lib/libc/sys/t_ptrace_wait.c:1.131.2.3
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.131.2.2	Tue Oct 15 18:34:34 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Tue Oct 15 18:40:02 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.131.2.2 2019/10/15 18:34:34 martin Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.131.2.3 2019/10/15 18:40:02 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.131.2.2 2019/10/15 18:34:34 martin Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.131.2.3 2019/10/15 18:40:02 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -5432,12 +5432,15 @@ TRACEME_EXEC(traceme_signalignored_exec,
 #define TRACE_THREADS_NUM 100
 
 static volatile int done;
+pthread_mutex_t trace_threads_mtx = PTHREAD_MUTEX_INITIALIZER;
 
 static void *
 trace_threads_cb(void *arg __unused)
 {
 
+	pthread_mutex_lock(&trace_threads_mtx);
 	done++;
+	pthread_mutex_unlock(&trace_threads_mtx);
 
 	while (done < TRACE_THREADS_NUM)
 		sched_yield();