From: Tom de Vries <tdevries@suse.de>
Date: Fri, 28 Jul 2023 14:01:51 +0000 (+0200)
Subject: [gdb] Rename variable main_thread to main_thread_id
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=07d8d4bd2ad213281be502d6e56c19e0269b8967;p=binutils-gdb.git

[gdb] Rename variable main_thread to main_thread_id

I noticed that the variable main_thread:
...
/* The main thread.  */

static std::thread::id main_thread;
...
has a confusing name and corresponding comment, because it doesn't contain the
main thread, but rather the main thread's std::thread::id.

Fix this by renaming to main_thread_id.

Tested on x86_64-linux.

Approved-By: Tom Tromey <tom@tromey.com>
---

diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
index c7d9de0afc8..91d25dae28f 100644
--- a/gdb/run-on-main-thread.c
+++ b/gdb/run-on-main-thread.c
@@ -39,9 +39,9 @@ static std::vector<std::function<void ()>> runnables;
 
 static std::mutex runnable_mutex;
 
-/* The main thread.  */
+/* The main thread's thread id.  */
 
-static std::thread::id main_thread;
+static std::thread::id main_thread_id;
 
 #endif
 
@@ -100,7 +100,7 @@ bool
 is_main_thread ()
 {
 #if CXX_STD_THREAD
-  return std::this_thread::get_id () == main_thread;
+  return std::this_thread::get_id () == main_thread_id;
 #else
   return true;
 #endif
@@ -111,7 +111,7 @@ void
 _initialize_run_on_main_thread ()
 {
 #if CXX_STD_THREAD
-  main_thread = std::this_thread::get_id ();
+  main_thread_id = std::this_thread::get_id ();
 #endif
   runnable_event = make_serial_event ();
   add_file_handler (serial_event_fd (runnable_event), run_events, nullptr,