* [review v3] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
@ 2019-10-30 22:54 ` Tom Tromey (Code Review)
2019-11-22 18:39 ` Pedro Alves (Code Review)
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Tom Tromey (Code Review) @ 2019-10-30 22:54 UTC (permalink / raw)
To: gdb-patches
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Introduce run_on_main_thread
This introduces a way for a callback to be run on the main thread.
2019-10-19 Tom Tromey <tom@tromey.com>
* unittests/main-thread-selftests.c: New file.
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
main-thread-selftests.c.
* ser-event.h (run_on_main_thread): Declare.
* ser-event.c (runnable_event, runnables, runnable_mutex): New
globals.
(run_events, run_on_main_thread, _initialize_ser_event): New
functions.
Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
---
M gdb/ChangeLog
M gdb/Makefile.in
M gdb/ser-event.c
M gdb/ser-event.h
A gdb/unittests/main-thread-selftests.c
5 files changed, 176 insertions(+), 0 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 90e4d27..4992399 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
2019-10-19 Tom Tromey <tom@tromey.com>
+ * unittests/main-thread-selftests.c: New file.
+ * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
+ main-thread-selftests.c.
+ * ser-event.h (run_on_main_thread): Declare.
+ * ser-event.c (runnable_event, runnables, runnable_mutex): New
+ globals.
+ (run_events, run_on_main_thread, _initialize_ser_event): New
+ functions.
+
+2019-10-19 Tom Tromey <tom@tromey.com>
+
* main.c (setup_alternate_signal_stack): Remove.
(captured_main_1): Use gdb::alternate_signal_stack.
* gdbsupport/alt-stack.h: New file.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index af42c8b..e3433b2 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -433,6 +433,7 @@
unittests/optional-selftests.c \
unittests/parse-connection-spec-selftests.c \
unittests/ptid-selftests.c \
+ unittests/main-thread-selftests.c \
unittests/mkdir-recursive-selftests.c \
unittests/rsp-low-selftests.c \
unittests/scoped_fd-selftests.c \
diff --git a/gdb/ser-event.c b/gdb/ser-event.c
index a65a186..029ced7 100644
--- a/gdb/ser-event.c
+++ b/gdb/ser-event.c
@@ -20,6 +20,10 @@
#include "ser-event.h"
#include "serial.h"
#include "gdbsupport/filestuff.h"
+#if CXX_STD_THREAD
+#include <mutex>
+#endif
+#include "event-loop.h"
/* On POSIX hosts, a serial_event is basically an abstraction for the
classical self-pipe trick.
@@ -217,3 +221,77 @@
ResetEvent (state->event);
#endif
}
+
+\f
+
+/* 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;
+
+#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 ser-event.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);
+}
+
+void
+_initialize_ser_event ()
+{
+ runnable_event = make_serial_event ();
+ add_file_handler (serial_event_fd (runnable_event), run_events, nullptr);
+}
diff --git a/gdb/ser-event.h b/gdb/ser-event.h
index 1373485..61a84f9 100644
--- a/gdb/ser-event.h
+++ b/gdb/ser-event.h
@@ -19,6 +19,8 @@
#ifndef SER_EVENT_H
#define SER_EVENT_H
+#include <functional>
+
/* This is used to be able to signal the event loop (or any other
select/poll) of events, in a race-free manner.
@@ -48,4 +50,8 @@
call is made. */
extern void serial_event_clear (struct serial_event *event);
+/* Send a runnable to the main thread. */
+
+extern void run_on_main_thread (std::function<void ()> &&);
+
#endif
diff --git a/gdb/unittests/main-thread-selftests.c b/gdb/unittests/main-thread-selftests.c
new file mode 100644
index 0000000..e5bd2d3
--- /dev/null
+++ b/gdb/unittests/main-thread-selftests.c
@@ -0,0 +1,80 @@
+/* Self tests for run_on_main_thread
+
+ Copyright (C) 2019 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 "gdbsupport/selftest.h"
+#include "gdbsupport/block-signals.h"
+#include "ser-event.h"
+#include "event-loop.h"
+#if CXX_STD_THREAD
+#include <thread>
+#endif
+
+namespace selftests {
+namespace main_thread_tests {
+
+#if CXX_STD_THREAD
+
+static bool done;
+
+static void
+set_done ()
+{
+ run_on_main_thread ([] ()
+ {
+ done = true;
+ });
+}
+
+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 ();
+}
+
+#endif
+
+}
+}
+
+void
+_initialize_main_thread_selftests ()
+{
+#if CXX_STD_THREAD
+ selftests::register_test ("main_thread",
+ selftests::main_thread_tests::run_tests);
+#endif
+}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 3
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newpatchset
^ permalink raw reply [flat|nested] 9+ messages in thread
* [review v3] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
2019-10-30 22:54 ` [review v3] " Tom Tromey (Code Review)
@ 2019-11-22 18:39 ` Pedro Alves (Code Review)
2019-11-22 19:00 ` Pedro Alves (Code Review)
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Pedro Alves (Code Review) @ 2019-11-22 18:39 UTC (permalink / raw)
To: Tom Tromey, gdb-patches
Pedro Alves has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Patch Set 3: Code-Review+2
(2 comments)
| --- gdb/ser-event.c
| +++ gdb/ser-event.c
| @@ -220,0 +228,19 @@ /* 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. */
PS3, Line 237:
Uppercase runnable_event / runnables ?
| +
| +static std::mutex runnable_mutex;
| +
| +#endif
| +
| +/* Run all the queued runnables. */
| +
| +static void
| +run_events (int error, gdb_client_data client_data)
| --- /dev/null
| +++ gdb/unittests/main-thread-selftests.c
| @@ -1,0 +68,13 @@ run_tests ()
| +#endif
| +
| +}
| +}
| +
| +void
| +_initialize_main_thread_selftests ()
| +{
| +#if CXX_STD_THREAD
| + selftests::register_test ("main_thread",
PS3, Line 77:
Any reason this isn't named "run_on_main_thread"?
Just thinking about whether that would make "maint info selftests"
output more obvious. I imagine that that command could have a
completer and "maint info selftests run_on<TAB>" would be the obvious
thing to typo.
Actually, this is so minor that I don't know why I'm mentioning it.
Please ignore. :-D
Thanks much for adding the unit test.
| + selftests::main_thread_tests::run_tests);
| +#endif
| +}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 3
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Comment-Date: Fri, 22 Nov 2019 18:38:49 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 9+ messages in thread
* [review v3] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
2019-10-30 22:54 ` [review v3] " Tom Tromey (Code Review)
2019-11-22 18:39 ` Pedro Alves (Code Review)
@ 2019-11-22 19:00 ` Pedro Alves (Code Review)
2019-11-22 23:05 ` Tom Tromey (Code Review)
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Pedro Alves (Code Review) @ 2019-11-22 19:00 UTC (permalink / raw)
To: Tom Tromey, gdb-patches
Pedro Alves has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Patch Set 3:
Actually, I have one comment more.
I only realized this is declared in ser-event.h when I read a following patch. Blame it on not being used to gerrit. :-D run_on_main_thread happens to use ser-event internally, but that's an implementation detail. I'd rather not leak implementation details like this. I think it deserves its own run-on-main-thread.h/c (or some such) files. Leave it as a consumer of ser-event, not a sibling. IMO.
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 3
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Comment-Date: Fri, 22 Nov 2019 19:00:29 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 9+ messages in thread
* [review v3] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
` (2 preceding siblings ...)
2019-11-22 19:00 ` Pedro Alves (Code Review)
@ 2019-11-22 23:05 ` Tom Tromey (Code Review)
2019-11-22 23:50 ` [review v4] " Tom Tromey (Code Review)
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Tom Tromey (Code Review) @ 2019-11-22 23:05 UTC (permalink / raw)
To: gdb-patches; +Cc: Pedro Alves
Tom Tromey has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Patch Set 3:
(1 comment)
| --- /dev/null
| +++ gdb/unittests/main-thread-selftests.c
| @@ -1,0 +68,13 @@ run_tests ()
| +#endif
| +
| +}
| +}
| +
| +void
| +_initialize_main_thread_selftests ()
| +{
| +#if CXX_STD_THREAD
| + selftests::register_test ("main_thread",
PS3, Line 77:
> Any reason this isn't named "run_on_main_thread"?
I went ahead and changed it.
> I imagine that that command could have a completer and "maint info selftests run_on<TAB>" would be the obvious thing to typo.
The command currently uses a regexp, which makes completion less
handy. I wouldn't mind if this were changed, though.
| + selftests::main_thread_tests::run_tests);
| +#endif
| +}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 3
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Reviewer: Tom Tromey <tromey@sourceware.org>
Gerrit-Comment-Date: Fri, 22 Nov 2019 23:05:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Pedro Alves <palves@redhat.com>
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 9+ messages in thread
* [review v4] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
` (3 preceding siblings ...)
2019-11-22 23:05 ` Tom Tromey (Code Review)
@ 2019-11-22 23:50 ` Tom Tromey (Code Review)
2019-11-26 15:46 ` Pedro Alves (Code Review)
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Tom Tromey (Code Review) @ 2019-11-22 23:50 UTC (permalink / raw)
To: Pedro Alves, gdb-patches
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Introduce run_on_main_thread
This introduces a way for a callback to be run on the main thread.
gdb/ChangeLog
2019-11-22 Tom Tromey <tom@tromey.com>
* run-on-main-thread.c: New file.
* run-on-main-thread.h: New file.
* unittests/main-thread-selftests.c: New file.
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
main-thread-selftests.c.
(HFILES_NO_SRCDIR): Add run-on-main-thread.h.
(COMMON_SFILES): Add run-on-main-thread.c.
Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
---
M gdb/ChangeLog
M gdb/Makefile.in
A gdb/run-on-main-thread.c
A gdb/run-on-main-thread.h
A gdb/unittests/main-thread-selftests.c
5 files changed, 218 insertions(+), 0 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ad80c36..901adeb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2019-11-22 Tom Tromey <tom@tromey.com>
+
+ * run-on-main-thread.c: New file.
+ * run-on-main-thread.h: New file.
+ * unittests/main-thread-selftests.c: New file.
+ * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
+ main-thread-selftests.c.
+ (HFILES_NO_SRCDIR): Add run-on-main-thread.h.
+ (COMMON_SFILES): Add run-on-main-thread.c.
+
2019-10-19 Tom Tromey <tom@tromey.com>
* main.c (setup_alternate_signal_stack): Remove.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8d248ae..c487b10 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -433,6 +433,7 @@
unittests/optional-selftests.c \
unittests/parse-connection-spec-selftests.c \
unittests/ptid-selftests.c \
+ unittests/main-thread-selftests.c \
unittests/mkdir-recursive-selftests.c \
unittests/rsp-low-selftests.c \
unittests/scoped_fd-selftests.c \
@@ -1116,6 +1117,7 @@
remote-fileio.c \
remote-notif.c \
reverse.c \
+ run-on-main-thread.c \
rust-lang.c \
sentinel-frame.c \
ser-event.c \
@@ -1378,6 +1380,7 @@
riscv-tdep.h \
rs6000-aix-tdep.h \
rs6000-tdep.h \
+ run-on-main-thread.h \
s390-linux-tdep.h \
s390-tdep.h \
score-tdep.h \
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
new file mode 100644
index 0000000..86824b5
--- /dev/null
+++ b/gdb/run-on-main-thread.c
@@ -0,0 +1,97 @@
+/* Run a function on the main thread
+ Copyright (C) 2019 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 <mutex>
+#endif
+#include "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;
+
+#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);
+}
+
+void
+_initialize_run_on_main_thread ()
+{
+ runnable_event = make_serial_event ();
+ add_file_handler (serial_event_fd (runnable_event), run_events, nullptr);
+}
diff --git a/gdb/run-on-main-thread.h b/gdb/run-on-main-thread.h
new file mode 100644
index 0000000..fd1a2c4
--- /dev/null
+++ b/gdb/run-on-main-thread.h
@@ -0,0 +1,28 @@
+/* Run a function on the main thread
+ Copyright (C) 2019 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/>. */
+
+#ifndef GDB_RUN_ON_MAIN_THREAD_H
+#define GDB_RUN_ON_MAIN_THREAD_H
+
+#include <functional>
+
+/* Send a runnable to the main thread. */
+
+extern void run_on_main_thread (std::function<void ()> &&);
+
+#endif /* GDB_RUN_ON_MAIN_THREAD_H */
diff --git a/gdb/unittests/main-thread-selftests.c b/gdb/unittests/main-thread-selftests.c
new file mode 100644
index 0000000..2324e98
--- /dev/null
+++ b/gdb/unittests/main-thread-selftests.c
@@ -0,0 +1,80 @@
+/* Self tests for run_on_main_thread
+
+ Copyright (C) 2019 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 "gdbsupport/selftest.h"
+#include "gdbsupport/block-signals.h"
+#include "run-on-main-thread.h"
+#include "event-loop.h"
+#if CXX_STD_THREAD
+#include <thread>
+#endif
+
+namespace selftests {
+namespace main_thread_tests {
+
+#if CXX_STD_THREAD
+
+static bool done;
+
+static void
+set_done ()
+{
+ run_on_main_thread ([] ()
+ {
+ done = true;
+ });
+}
+
+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 ();
+}
+
+#endif
+
+}
+}
+
+void
+_initialize_main_thread_selftests ()
+{
+#if CXX_STD_THREAD
+ selftests::register_test ("run_on_main_thread",
+ selftests::main_thread_tests::run_tests);
+#endif
+}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 4
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Reviewer: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newpatchset
^ permalink raw reply [flat|nested] 9+ messages in thread
* [review v4] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
` (4 preceding siblings ...)
2019-11-22 23:50 ` [review v4] " Tom Tromey (Code Review)
@ 2019-11-26 15:46 ` Pedro Alves (Code Review)
2019-11-26 21:13 ` [pushed] " Sourceware to Gerrit sync (Code Review)
2019-11-26 21:14 ` Sourceware to Gerrit sync (Code Review)
7 siblings, 0 replies; 9+ messages in thread
From: Pedro Alves (Code Review) @ 2019-11-26 15:46 UTC (permalink / raw)
To: Tom Tromey, gdb-patches
Pedro Alves has posted comments on this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Patch Set 4: Code-Review+2
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 4
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Reviewer: Tom Tromey <tromey@sourceware.org>
Gerrit-Comment-Date: Tue, 26 Nov 2019 15:46:30 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
^ permalink raw reply [flat|nested] 9+ messages in thread
* [pushed] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
` (5 preceding siblings ...)
2019-11-26 15:46 ` Pedro Alves (Code Review)
@ 2019-11-26 21:13 ` Sourceware to Gerrit sync (Code Review)
2019-11-26 21:14 ` Sourceware to Gerrit sync (Code Review)
7 siblings, 0 replies; 9+ messages in thread
From: Sourceware to Gerrit sync (Code Review) @ 2019-11-26 21:13 UTC (permalink / raw)
To: Tom Tromey, Pedro Alves, gdb-patches
The original change was created by Tom Tromey.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Introduce run_on_main_thread
This introduces a way for a callback to be run on the main thread.
gdb/ChangeLog
2019-11-26 Tom Tromey <tom@tromey.com>
* run-on-main-thread.c: New file.
* run-on-main-thread.h: New file.
* unittests/main-thread-selftests.c: New file.
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
main-thread-selftests.c.
(HFILES_NO_SRCDIR): Add run-on-main-thread.h.
(COMMON_SFILES): Add run-on-main-thread.c.
Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
---
M gdb/ChangeLog
M gdb/Makefile.in
A gdb/run-on-main-thread.c
A gdb/run-on-main-thread.h
A gdb/unittests/main-thread-selftests.c
5 files changed, 218 insertions(+), 0 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7535016..80a3ea0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
2019-11-26 Tom Tromey <tom@tromey.com>
+ * run-on-main-thread.c: New file.
+ * run-on-main-thread.h: New file.
+ * unittests/main-thread-selftests.c: New file.
+ * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
+ main-thread-selftests.c.
+ (HFILES_NO_SRCDIR): Add run-on-main-thread.h.
+ (COMMON_SFILES): Add run-on-main-thread.c.
+
+2019-11-26 Tom Tromey <tom@tromey.com>
+
* main.c (setup_alternate_signal_stack): Remove.
(captured_main_1): Use gdb::alternate_signal_stack.
* gdbsupport/alt-stack.h: New file.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8d248ae..c487b10 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -433,6 +433,7 @@
unittests/optional-selftests.c \
unittests/parse-connection-spec-selftests.c \
unittests/ptid-selftests.c \
+ unittests/main-thread-selftests.c \
unittests/mkdir-recursive-selftests.c \
unittests/rsp-low-selftests.c \
unittests/scoped_fd-selftests.c \
@@ -1116,6 +1117,7 @@
remote-fileio.c \
remote-notif.c \
reverse.c \
+ run-on-main-thread.c \
rust-lang.c \
sentinel-frame.c \
ser-event.c \
@@ -1378,6 +1380,7 @@
riscv-tdep.h \
rs6000-aix-tdep.h \
rs6000-tdep.h \
+ run-on-main-thread.h \
s390-linux-tdep.h \
s390-tdep.h \
score-tdep.h \
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
new file mode 100644
index 0000000..86824b5
--- /dev/null
+++ b/gdb/run-on-main-thread.c
@@ -0,0 +1,97 @@
+/* Run a function on the main thread
+ Copyright (C) 2019 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 <mutex>
+#endif
+#include "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;
+
+#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);
+}
+
+void
+_initialize_run_on_main_thread ()
+{
+ runnable_event = make_serial_event ();
+ add_file_handler (serial_event_fd (runnable_event), run_events, nullptr);
+}
diff --git a/gdb/run-on-main-thread.h b/gdb/run-on-main-thread.h
new file mode 100644
index 0000000..fd1a2c4
--- /dev/null
+++ b/gdb/run-on-main-thread.h
@@ -0,0 +1,28 @@
+/* Run a function on the main thread
+ Copyright (C) 2019 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/>. */
+
+#ifndef GDB_RUN_ON_MAIN_THREAD_H
+#define GDB_RUN_ON_MAIN_THREAD_H
+
+#include <functional>
+
+/* Send a runnable to the main thread. */
+
+extern void run_on_main_thread (std::function<void ()> &&);
+
+#endif /* GDB_RUN_ON_MAIN_THREAD_H */
diff --git a/gdb/unittests/main-thread-selftests.c b/gdb/unittests/main-thread-selftests.c
new file mode 100644
index 0000000..2324e98
--- /dev/null
+++ b/gdb/unittests/main-thread-selftests.c
@@ -0,0 +1,80 @@
+/* Self tests for run_on_main_thread
+
+ Copyright (C) 2019 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 "gdbsupport/selftest.h"
+#include "gdbsupport/block-signals.h"
+#include "run-on-main-thread.h"
+#include "event-loop.h"
+#if CXX_STD_THREAD
+#include <thread>
+#endif
+
+namespace selftests {
+namespace main_thread_tests {
+
+#if CXX_STD_THREAD
+
+static bool done;
+
+static void
+set_done ()
+{
+ run_on_main_thread ([] ()
+ {
+ done = true;
+ });
+}
+
+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 ();
+}
+
+#endif
+
+}
+}
+
+void
+_initialize_main_thread_selftests ()
+{
+#if CXX_STD_THREAD
+ selftests::register_test ("run_on_main_thread",
+ selftests::main_thread_tests::run_tests);
+#endif
+}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 5
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Reviewer: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: newpatchset
^ permalink raw reply [flat|nested] 9+ messages in thread
* [pushed] Introduce run_on_main_thread
2019-10-20 4:02 [review] Introduce run_on_main_thread Tom Tromey (Code Review)
` (6 preceding siblings ...)
2019-11-26 21:13 ` [pushed] " Sourceware to Gerrit sync (Code Review)
@ 2019-11-26 21:14 ` Sourceware to Gerrit sync (Code Review)
7 siblings, 0 replies; 9+ messages in thread
From: Sourceware to Gerrit sync (Code Review) @ 2019-11-26 21:14 UTC (permalink / raw)
To: Tom Tromey, gdb-patches; +Cc: Pedro Alves
Sourceware to Gerrit sync has submitted this change.
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/170
......................................................................
Introduce run_on_main_thread
This introduces a way for a callback to be run on the main thread.
gdb/ChangeLog
2019-11-26 Tom Tromey <tom@tromey.com>
* run-on-main-thread.c: New file.
* run-on-main-thread.h: New file.
* unittests/main-thread-selftests.c: New file.
* Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
main-thread-selftests.c.
(HFILES_NO_SRCDIR): Add run-on-main-thread.h.
(COMMON_SFILES): Add run-on-main-thread.c.
Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
---
M gdb/ChangeLog
M gdb/Makefile.in
A gdb/run-on-main-thread.c
A gdb/run-on-main-thread.h
A gdb/unittests/main-thread-selftests.c
5 files changed, 218 insertions(+), 0 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7535016..80a3ea0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
2019-11-26 Tom Tromey <tom@tromey.com>
+ * run-on-main-thread.c: New file.
+ * run-on-main-thread.h: New file.
+ * unittests/main-thread-selftests.c: New file.
+ * Makefile.in (SUBDIR_UNITTESTS_SRCS): Add
+ main-thread-selftests.c.
+ (HFILES_NO_SRCDIR): Add run-on-main-thread.h.
+ (COMMON_SFILES): Add run-on-main-thread.c.
+
+2019-11-26 Tom Tromey <tom@tromey.com>
+
* main.c (setup_alternate_signal_stack): Remove.
(captured_main_1): Use gdb::alternate_signal_stack.
* gdbsupport/alt-stack.h: New file.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 8d248ae..c487b10 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -433,6 +433,7 @@
unittests/optional-selftests.c \
unittests/parse-connection-spec-selftests.c \
unittests/ptid-selftests.c \
+ unittests/main-thread-selftests.c \
unittests/mkdir-recursive-selftests.c \
unittests/rsp-low-selftests.c \
unittests/scoped_fd-selftests.c \
@@ -1116,6 +1117,7 @@
remote-fileio.c \
remote-notif.c \
reverse.c \
+ run-on-main-thread.c \
rust-lang.c \
sentinel-frame.c \
ser-event.c \
@@ -1378,6 +1380,7 @@
riscv-tdep.h \
rs6000-aix-tdep.h \
rs6000-tdep.h \
+ run-on-main-thread.h \
s390-linux-tdep.h \
s390-tdep.h \
score-tdep.h \
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
new file mode 100644
index 0000000..86824b5
--- /dev/null
+++ b/gdb/run-on-main-thread.c
@@ -0,0 +1,97 @@
+/* Run a function on the main thread
+ Copyright (C) 2019 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 <mutex>
+#endif
+#include "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;
+
+#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);
+}
+
+void
+_initialize_run_on_main_thread ()
+{
+ runnable_event = make_serial_event ();
+ add_file_handler (serial_event_fd (runnable_event), run_events, nullptr);
+}
diff --git a/gdb/run-on-main-thread.h b/gdb/run-on-main-thread.h
new file mode 100644
index 0000000..fd1a2c4
--- /dev/null
+++ b/gdb/run-on-main-thread.h
@@ -0,0 +1,28 @@
+/* Run a function on the main thread
+ Copyright (C) 2019 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/>. */
+
+#ifndef GDB_RUN_ON_MAIN_THREAD_H
+#define GDB_RUN_ON_MAIN_THREAD_H
+
+#include <functional>
+
+/* Send a runnable to the main thread. */
+
+extern void run_on_main_thread (std::function<void ()> &&);
+
+#endif /* GDB_RUN_ON_MAIN_THREAD_H */
diff --git a/gdb/unittests/main-thread-selftests.c b/gdb/unittests/main-thread-selftests.c
new file mode 100644
index 0000000..2324e98
--- /dev/null
+++ b/gdb/unittests/main-thread-selftests.c
@@ -0,0 +1,80 @@
+/* Self tests for run_on_main_thread
+
+ Copyright (C) 2019 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 "gdbsupport/selftest.h"
+#include "gdbsupport/block-signals.h"
+#include "run-on-main-thread.h"
+#include "event-loop.h"
+#if CXX_STD_THREAD
+#include <thread>
+#endif
+
+namespace selftests {
+namespace main_thread_tests {
+
+#if CXX_STD_THREAD
+
+static bool done;
+
+static void
+set_done ()
+{
+ run_on_main_thread ([] ()
+ {
+ done = true;
+ });
+}
+
+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 ();
+}
+
+#endif
+
+}
+}
+
+void
+_initialize_main_thread_selftests ()
+{
+#if CXX_STD_THREAD
+ selftests::register_test ("run_on_main_thread",
+ selftests::main_thread_tests::run_tests);
+#endif
+}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I16ef82f0564e9f8a524bdc64cb31df79a988ad9f
Gerrit-Change-Number: 170
Gerrit-PatchSet: 5
Gerrit-Owner: Tom Tromey <tromey@sourceware.org>
Gerrit-Reviewer: Pedro Alves <palves@redhat.com>
Gerrit-Reviewer: Tom Tromey <tromey@sourceware.org>
Gerrit-MessageType: merged
^ permalink raw reply [flat|nested] 9+ messages in thread