mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-01 14:03:56 +08:00
c082d7f58e
I wrote a patch using is_main_thread (), and found it returning false in the main thread due to main_thread_id not being initialized yet. Initialization currently takes place in _initialize_run_on_main_thread, but that's too late for earlier uses. Fix this by initializing, either: - when entering main, or - on an earlier first use. Tested on x86_64-linux. Approved-By: Tom Tromey <tom@tromey.com>
137 lines
3.3 KiB
C
137 lines
3.3 KiB
C
/* Run a function on the main thread
|
|
Copyright (C) 2019-2023 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "run-on-main-thread.h"
|
|
#include "ser-event.h"
|
|
#if CXX_STD_THREAD
|
|
#include <thread>
|
|
#include <mutex>
|
|
#endif
|
|
#include "gdbsupport/event-loop.h"
|
|
|
|
/* The serial event used when posting runnables. */
|
|
|
|
static struct serial_event *runnable_event;
|
|
|
|
/* Runnables that have been posted. */
|
|
|
|
static std::vector<std::function<void ()>> runnables;
|
|
|
|
#if CXX_STD_THREAD
|
|
|
|
/* Mutex to hold when handling RUNNABLE_EVENT or RUNNABLES. */
|
|
|
|
static std::mutex runnable_mutex;
|
|
|
|
/* The main thread's thread id. */
|
|
|
|
static std::thread::id main_thread_id;
|
|
|
|
#endif
|
|
|
|
/* Run all the queued runnables. */
|
|
|
|
static void
|
|
run_events (int error, gdb_client_data client_data)
|
|
{
|
|
std::vector<std::function<void ()>> local;
|
|
|
|
/* Hold the lock while changing the globals, but not while running
|
|
the runnables. */
|
|
{
|
|
#if CXX_STD_THREAD
|
|
std::lock_guard<std::mutex> lock (runnable_mutex);
|
|
#endif
|
|
|
|
/* Clear the event fd. Do this before flushing the events list,
|
|
so that any new event post afterwards is sure to re-awaken the
|
|
event loop. */
|
|
serial_event_clear (runnable_event);
|
|
|
|
/* Move the vector in case running a runnable pushes a new
|
|
runnable. */
|
|
local = std::move (runnables);
|
|
}
|
|
|
|
for (auto &item : local)
|
|
{
|
|
try
|
|
{
|
|
item ();
|
|
}
|
|
catch (...)
|
|
{
|
|
/* Ignore exceptions in the callback. */
|
|
}
|
|
}
|
|
}
|
|
|
|
/* See run-on-main-thread.h. */
|
|
|
|
void
|
|
run_on_main_thread (std::function<void ()> &&func)
|
|
{
|
|
#if CXX_STD_THREAD
|
|
std::lock_guard<std::mutex> lock (runnable_mutex);
|
|
#endif
|
|
runnables.emplace_back (std::move (func));
|
|
serial_event_set (runnable_event);
|
|
}
|
|
|
|
#if CXX_STD_THREAD
|
|
static bool main_thread_id_initialized = false;
|
|
#endif
|
|
|
|
/* See run-on-main-thread.h. */
|
|
|
|
bool
|
|
is_main_thread ()
|
|
{
|
|
#if CXX_STD_THREAD
|
|
/* Initialize main_thread_id on first use of is_main_thread. */
|
|
if (!main_thread_id_initialized)
|
|
{
|
|
main_thread_id_initialized = true;
|
|
|
|
main_thread_id = std::this_thread::get_id ();
|
|
}
|
|
|
|
return std::this_thread::get_id () == main_thread_id;
|
|
#else
|
|
return true;
|
|
#endif
|
|
}
|
|
|
|
void _initialize_run_on_main_thread ();
|
|
void
|
|
_initialize_run_on_main_thread ()
|
|
{
|
|
#if CXX_STD_THREAD
|
|
/* The variable main_thread_id should be initialized when entering main, or
|
|
at an earlier use, so it should already be initialized here. */
|
|
gdb_assert (main_thread_id_initialized);
|
|
|
|
/* Assume that we execute this in the main thread. */
|
|
gdb_assert (is_main_thread ());
|
|
#endif
|
|
runnable_event = make_serial_event ();
|
|
add_file_handler (serial_event_fd (runnable_event), run_events, nullptr,
|
|
"run-on-main-thread");
|
|
}
|