From: Olivier Dion <olivier.dion@polymtl.ca>
To: 61058@debbugs.gnu.org
Cc: Olivier Dion <olivier.dion@polymtl.ca>
Subject: bug#61058: [PATCH v2] Fix asymetric mutex locking when joining thread.
Date: Thu, 25 Jan 2024 16:45:47 -0500 [thread overview]
Message-ID: <20240125214547.3951-1-olivier.dion@polymtl.ca> (raw)
In-Reply-To: <20230125152403.19091-1-olivier.dion@polymtl.ca>
If `join-thread' timeout, the thread mutex is not unlocked, resulting in
deadlock to the next call to it or deadlock of the thread itself when it
terminates.
Thus, always unlock the mutex.
Fix: #55356
* module/ice-9/threads.scm (join-thread): Always unlock thread mutex.
* test-suite/tests/threads.test (join-thread): New test to ensure the
mutex is released
---
module/ice-9/threads.scm | 4 +++-
test-suite/tests/threads.test | 13 ++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/module/ice-9/threads.scm b/module/ice-9/threads.scm
index 048d8b085..a1e43b9fa 100644
--- a/module/ice-9/threads.scm
+++ b/module/ice-9/threads.scm
@@ -204,7 +204,9 @@ terminates, unless the target @var{thread} has already terminated."
(wait-condition-variable cv mutex timeout)
(wait-condition-variable cv mutex))
(lp))
- (else timeoutval))))))
+ (else
+ (unlock-mutex mutex)
+ timeoutval))))))
(define* (try-mutex mutex)
"Try to lock @var{mutex}. If the mutex is already locked, return
diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
index efdf36db2..af8c8c75b 100644
--- a/test-suite/tests/threads.test
+++ b/test-suite/tests/threads.test
@@ -332,7 +332,18 @@
(sleep 2)
(system-async-mark aproc)
(join-thread other-thread)))
- #t))
+ #t)
+
+ (pass-if "do not throw exception if trying to join after timeout"
+ (let ((other-thread (begin-thread (pause))))
+ (dynamic-wind
+ (const #f)
+ (lambda ()
+ (join-thread other-thread 1)
+ (join-thread other-thread 1)
+ #t)
+ (lambda ()
+ (cancel-thread other-thread))))))
;;
;; thread cancellation
--
2.41.0
next prev parent reply other threads:[~2024-01-25 21:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-25 15:24 bug#61058: [PATCH] Fix asymetric mutex locking when joining thread Olivier Dion via Bug reports for GUILE, GNU's Ubiquitous Extension Language
2024-01-25 21:45 ` Olivier Dion [this message]
2024-01-25 22:14 ` bug#61058: [PATCH v2] " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240125214547.3951-1-olivier.dion@polymtl.ca \
--to=olivier.dion@polymtl.ca \
--cc=61058@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).