diff options
author | Tom Tromey <tom@tromey.com> | 2016-10-02 10:50:20 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2018-03-19 09:37:49 -0600 |
commit | 76727919ceb590f03ff0f6db08b7ceab5b7aeaff (patch) | |
tree | bf78b72a63f09f3d2c619048b15d73c5f343e806 /gdb/tui/tui-interp.c | |
parent | 194ed4130dadb7dd1668f6af87405bdcd8041199 (diff) | |
download | gdb-76727919ceb590f03ff0f6db08b7ceab5b7aeaff.zip gdb-76727919ceb590f03ff0f6db08b7ceab5b7aeaff.tar.gz gdb-76727919ceb590f03ff0f6db08b7ceab5b7aeaff.tar.bz2 |
Convert observers to C++
This converts observers from using a special source-generating script
to be plain C++. This version of the patch takes advantage of C++11
by using std::function and variadic templates; incorporates Pedro's
patches; and renames the header file to "observable.h" (this change
eliminates the need for a clean rebuild).
Note that Pedro's patches used a template lambda in tui-hooks.c, but
this failed to compile on some buildbot instances (presumably due to
differing C++ versions); I replaced this with an ordinary template
function.
Regression tested on the buildbot.
gdb/ChangeLog
2018-03-19 Pedro Alves <palves@redhat.com>
Tom Tromey <tom@tromey.com>
* unittests/observable-selftests.c: New file.
* common/observable.h: New file.
* observable.h: New file.
* ada-lang.c, ada-tasks.c, agent.c, aix-thread.c, annotate.c,
arm-tdep.c, auto-load.c, auxv.c, break-catch-syscall.c,
breakpoint.c, bsd-uthread.c, cli/cli-interp.c, cli/cli-setshow.c,
corefile.c, dummy-frame.c, event-loop.c, event-top.c, exec.c,
extension.c, frame.c, gdbarch.c, guile/scm-breakpoint.c,
infcall.c, infcmd.c, inferior.c, inflow.c, infrun.c, jit.c,
linux-tdep.c, linux-thread-db.c, m68klinux-tdep.c,
mi/mi-cmd-break.c, mi/mi-interp.c, mi/mi-main.c, objfiles.c,
ppc-linux-nat.c, ppc-linux-tdep.c, printcmd.c, procfs.c,
python/py-breakpoint.c, python/py-finishbreakpoint.c,
python/py-inferior.c, python/py-unwind.c, ravenscar-thread.c,
record-btrace.c, record-full.c, record.c, regcache.c, remote.c,
riscv-tdep.c, sol-thread.c, solib-aix.c, solib-spu.c, solib.c,
spu-multiarch.c, spu-tdep.c, stack.c, symfile-mem.c, symfile.c,
symtab.c, thread.c, top.c, tracepoint.c, tui/tui-hooks.c,
tui/tui-interp.c, valops.c: Update all users.
* tui/tui-hooks.c (tui_bp_created_observer)
(tui_bp_deleted_observer, tui_bp_modified_observer)
(tui_inferior_exit_observer, tui_before_prompt_observer)
(tui_normal_stop_observer, tui_register_changed_observer):
Remove.
(tui_observers_token): New global.
(attach_or_detach, tui_attach_detach_observers): New functions.
(tui_install_hooks, tui_remove_hooks): Use
tui_attach_detach_observers.
* record-btrace.c (record_btrace_thread_observer): Remove.
(record_btrace_thread_observer_token): New global.
* observer.sh: Remove.
* observer.c: Rename to observable.c.
* observable.c (namespace gdb_observers): Define new objects.
(observer_debug): Move into gdb_observers namespace.
(struct observer, struct observer_list, xalloc_observer_list_node)
(xfree_observer_list_node, generic_observer_attach)
(generic_observer_detach, generic_observer_notify): Remove.
(_initialize_observer): Update.
Don't include observer.inc.
* Makefile.in (generated_files): Remove observer.h, observer.inc.
(clean mostlyclean): Likewise.
(observer.h, observer.inc): Remove targets.
(SUBDIR_UNITTESTS_SRCS): Add observable-selftests.c.
(COMMON_SFILES): Use observable.c, not observer.c.
* .gitignore: Remove observer.h.
gdb/doc/ChangeLog
2018-03-19 Tom Tromey <tom@tromey.com>
* observer.texi: Remove.
gdb/testsuite/ChangeLog
2018-03-19 Tom Tromey <tom@tromey.com>
* gdb.gdb/observer.exp: Remove.
Diffstat (limited to 'gdb/tui/tui-interp.c')
-rw-r--r-- | gdb/tui/tui-interp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c index 3c87198..cf32c90 100644 --- a/gdb/tui/tui-interp.c +++ b/gdb/tui/tui-interp.c @@ -31,7 +31,7 @@ #include "tui/tui.h" #include "tui/tui-io.h" #include "infrun.h" -#include "observer.h" +#include "observable.h" #include "gdbthread.h" /* Set to 1 when the TUI mode must be activated when we first start @@ -326,14 +326,14 @@ _initialize_tui_interp (void) } /* If changing this, remember to update cli-interp.c as well. */ - observer_attach_normal_stop (tui_on_normal_stop); - observer_attach_signal_received (tui_on_signal_received); - observer_attach_end_stepping_range (tui_on_end_stepping_range); - observer_attach_signal_exited (tui_on_signal_exited); - observer_attach_exited (tui_on_exited); - observer_attach_no_history (tui_on_no_history); - observer_attach_sync_execution_done (tui_on_sync_execution_done); - observer_attach_command_error (tui_on_command_error); - observer_attach_user_selected_context_changed + gdb::observers::normal_stop.attach (tui_on_normal_stop); + gdb::observers::signal_received.attach (tui_on_signal_received); + gdb::observers::end_stepping_range.attach (tui_on_end_stepping_range); + gdb::observers::signal_exited.attach (tui_on_signal_exited); + gdb::observers::exited.attach (tui_on_exited); + gdb::observers::no_history.attach (tui_on_no_history); + gdb::observers::sync_execution_done.attach (tui_on_sync_execution_done); + gdb::observers::command_error.attach (tui_on_command_error); + gdb::observers::user_selected_context_changed.attach (tui_on_user_selected_context_changed); } |