From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 4C00B3858C60; Tue, 14 Dec 2021 04:38:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C00B3858C60 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] pthread/tst-cancel28: Fix barrier re-init race condition X-Act-Checkin: glibc X-Git-Author: Stafford Horne X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: 1fe4b8d6937139faa47410552d4e21b356810d67 X-Git-Newrev: 06865865151579d1aa17d38110060a68b85c5d90 Message-Id: <20211214043804.4C00B3858C60@sourceware.org> Date: Tue, 14 Dec 2021 04:38:04 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Dec 2021 04:38:04 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=06865865151579d1aa17d38110060a68b85c5d90 commit 06865865151579d1aa17d38110060a68b85c5d90 Author: Stafford Horne Date: Sat Sep 25 17:02:06 2021 +0900 pthread/tst-cancel28: Fix barrier re-init race condition When running this test on the OpenRISC port I am working on this test fails with a timeout. The test passes when being straced or debugged. Looking at the code there seems to be a race condition in that: 1 main thread: calls xpthread_cancel 2 sub thread : receives cancel signal 3 sub thread : cleanup routine waits on barrier 4 main thread: re-inits barrier 5 main thread: waits on barrier After getting to 5 the main thread and sub thread wait forever as the 2 barriers are no longer the same. Removing the barrier re-init seems to fix this issue. Also, the barrier does not need to be reinitialized as that is done by default. Reviewed-by: Adhemerval Zanella (cherry picked from commit 9874ca536b1d0662b1cea46af3ce09a4d42aeb32) Diff: --- sysdeps/pthread/tst-cancel28.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sysdeps/pthread/tst-cancel28.c b/sysdeps/pthread/tst-cancel28.c index 627cbc8160..9286c159b3 100644 --- a/sysdeps/pthread/tst-cancel28.c +++ b/sysdeps/pthread/tst-cancel28.c @@ -69,7 +69,6 @@ do_test (void) xpthread_cancel (timer_thread); - xpthread_barrier_init (&barrier, NULL, 2); xpthread_barrier_wait (&barrier); return 0;