public inbox for
help / color / mirror / Atom feed
From: Tom de Vries <>
Subject: [binutils-gdb] [gdb] Fix abort in selftest run_on_main_thread with ^C
Date: Mon, 12 Sep 2022 08:05:39 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=3d36a6396fbfacd7b1941527d84ff6c0f40ff121

commit 3d36a6396fbfacd7b1941527d84ff6c0f40ff121
Author: Tom de Vries <>
Date:   Mon Sep 12 10:05:18 2022 +0200

    [gdb] Fix abort in selftest run_on_main_thread with ^C
    When running selftest run_on_main_thread and pressing ^C, we can run into:
    Running selftest run_on_main_thread.
    terminate called without an active exception
    Fatal signal: Aborted
    The selftest function looks like this:
    static void
    run_tests ()
      std::thread thread;
      done = false;
        gdb::block_signals blocker;
        thread = std::thread (set_done);
      while (!done && gdb_do_one_event () >= 0)
      /* Actually the test will just hang, but we want to test
         something.  */
      SELF_CHECK (done);
      thread.join ();
    The error message we see is due to the destructor of thread being called while
    thread is joinable.
    This is supposed to be taken care of by thread.join (), but the ^C prevents
    that one from being called, while the destructor is still called.
    Fix this by ensuring thread.join () is called (if indeed required) before the
    destructor using SCOPE_EXIT.
    Tested on x86_64-linux.

 gdb/unittests/main-thread-selftests.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gdb/unittests/main-thread-selftests.c b/gdb/unittests/main-thread-selftests.c
index 7e1a30d7e80..8ab0c445d42 100644
--- a/gdb/unittests/main-thread-selftests.c
+++ b/gdb/unittests/main-thread-selftests.c
@@ -20,6 +20,7 @@
 #include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/block-signals.h"
+#include "gdbsupport/scope-exit.h"
 #include "run-on-main-thread.h"
 #include "gdbsupport/event-loop.h"
@@ -52,6 +53,11 @@ run_tests ()
     gdb::block_signals blocker;
+      {
+	if (thread.joinable ())
+	  thread.join ();
+      };
     thread = std::thread (set_done);
@@ -61,8 +67,6 @@ run_tests ()
   /* Actually the test will just hang, but we want to test
      something.  */
   SELF_CHECK (done);
-  thread.join ();

                 reply	other threads:[~2022-09-12  8:05 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* 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).