aboutsummaryrefslogtreecommitdiff
path: root/gdb/run-on-main-thread.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2022-03-29 14:36:10 -0600
committerTom Tromey <tom@tromey.com>2022-03-30 13:39:48 -0600
commit47ccd6b84bdf35688fb1516f06db68462bd24585 (patch)
treec2fba1dac46a3637842d73a943a7e858c0fb0290 /gdb/run-on-main-thread.c
parentcd1c3a45442e8ef68d062215d508c8104a8e008d (diff)
downloadgdb-47ccd6b84bdf35688fb1516f06db68462bd24585.zip
gdb-47ccd6b84bdf35688fb1516f06db68462bd24585.tar.gz
gdb-47ccd6b84bdf35688fb1516f06db68462bd24585.tar.bz2
Only allow QUIT on the main thread
Pedro pointed out that gdb worker threads should not react to quits. While I don't think that the new DWARF reader can call QUIT from a worker thread (and I don't think the existing minsym threading code can either), it seems safest to address this before checking in the new code. This patch arranges for the QUIT macro to only work on the main thread.
Diffstat (limited to 'gdb/run-on-main-thread.c')
-rw-r--r--gdb/run-on-main-thread.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
index ea633d9..eb22310 100644
--- a/gdb/run-on-main-thread.c
+++ b/gdb/run-on-main-thread.c
@@ -20,6 +20,7 @@
#include "run-on-main-thread.h"
#include "ser-event.h"
#if CXX_STD_THREAD
+#include <thread>
#include <mutex>
#endif
#include "gdbsupport/event-loop.h"
@@ -38,6 +39,10 @@ static std::vector<std::function<void ()>> runnables;
static std::mutex runnable_mutex;
+/* The main thread. */
+
+static std::thread::id main_thread;
+
#endif
/* Run all the queued runnables. */
@@ -89,10 +94,25 @@ run_on_main_thread (std::function<void ()> &&func)
serial_event_set (runnable_event);
}
+/* See run-on-main-thread.h. */
+
+bool
+is_main_thread ()
+{
+#if CXX_STD_THREAD
+ return std::this_thread::get_id () == main_thread;
+#else
+ return true;
+#endif
+}
+
void _initialize_run_on_main_thread ();
void
_initialize_run_on_main_thread ()
{
+#if CXX_STD_THREAD
+ main_thread = std::this_thread::get_id ();
+#endif
runnable_event = make_serial_event ();
add_file_handler (serial_event_fd (runnable_event), run_events, nullptr,
"run-on-main-thread");