aboutsummaryrefslogtreecommitdiff
path: root/gdb/mi
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2016-10-02 10:50:20 -0600
committerTom Tromey <tom@tromey.com>2018-03-19 09:37:49 -0600
commit76727919ceb590f03ff0f6db08b7ceab5b7aeaff (patch)
treebf78b72a63f09f3d2c619048b15d73c5f343e806 /gdb/mi
parent194ed4130dadb7dd1668f6af87405bdcd8041199 (diff)
downloadgdb-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/mi')
-rw-r--r--gdb/mi/mi-cmd-break.c6
-rw-r--r--gdb/mi/mi-interp.c58
-rw-r--r--gdb/mi/mi-main.c10
3 files changed, 37 insertions, 37 deletions
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 243a9d0..c1f5e2d 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -24,7 +24,7 @@
#include "mi-out.h"
#include "breakpoint.h"
#include "mi-getopt.h"
-#include "observer.h"
+#include "observable.h"
#include "mi-main.h"
#include "mi-cmd-break.h"
#include "language.h"
@@ -84,7 +84,7 @@ setup_breakpoint_reporting (void)
{
if (! mi_breakpoint_observers_installed)
{
- observer_attach_breakpoint_created (breakpoint_notify);
+ gdb::observers::breakpoint_created.attach (breakpoint_notify);
mi_breakpoint_observers_installed = 1;
}
@@ -394,7 +394,7 @@ mi_cmd_break_passcount (const char *command, char **argv, int argc)
if (t)
{
t->pass_count = p;
- observer_notify_breakpoint_modified (t);
+ gdb::observers::breakpoint_modified.notify (t);
}
else
{
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 2ec1d69..0a96138 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -30,7 +30,7 @@
#include "mi-out.h"
#include "mi-console.h"
#include "mi-common.h"
-#include "observer.h"
+#include "observable.h"
#include "gdbthread.h"
#include "solist.h"
#include "objfiles.h"
@@ -1353,33 +1353,33 @@ _initialize_mi_interp (void)
interp_factory_register (INTERP_MI3, mi_interp_factory);
interp_factory_register (INTERP_MI, mi_interp_factory);
- observer_attach_signal_received (mi_on_signal_received);
- observer_attach_end_stepping_range (mi_on_end_stepping_range);
- observer_attach_signal_exited (mi_on_signal_exited);
- observer_attach_exited (mi_on_exited);
- observer_attach_no_history (mi_on_no_history);
- observer_attach_new_thread (mi_new_thread);
- observer_attach_thread_exit (mi_thread_exit);
- observer_attach_inferior_added (mi_inferior_added);
- observer_attach_inferior_appeared (mi_inferior_appeared);
- observer_attach_inferior_exit (mi_inferior_exit);
- observer_attach_inferior_removed (mi_inferior_removed);
- observer_attach_record_changed (mi_record_changed);
- observer_attach_normal_stop (mi_on_normal_stop);
- observer_attach_target_resumed (mi_on_resume);
- observer_attach_solib_loaded (mi_solib_loaded);
- observer_attach_solib_unloaded (mi_solib_unloaded);
- observer_attach_about_to_proceed (mi_about_to_proceed);
- observer_attach_traceframe_changed (mi_traceframe_changed);
- observer_attach_tsv_created (mi_tsv_created);
- observer_attach_tsv_deleted (mi_tsv_deleted);
- observer_attach_tsv_modified (mi_tsv_modified);
- observer_attach_breakpoint_created (mi_breakpoint_created);
- observer_attach_breakpoint_deleted (mi_breakpoint_deleted);
- observer_attach_breakpoint_modified (mi_breakpoint_modified);
- observer_attach_command_param_changed (mi_command_param_changed);
- observer_attach_memory_changed (mi_memory_changed);
- observer_attach_sync_execution_done (mi_on_sync_execution_done);
- observer_attach_user_selected_context_changed
+ gdb::observers::signal_received.attach (mi_on_signal_received);
+ gdb::observers::end_stepping_range.attach (mi_on_end_stepping_range);
+ gdb::observers::signal_exited.attach (mi_on_signal_exited);
+ gdb::observers::exited.attach (mi_on_exited);
+ gdb::observers::no_history.attach (mi_on_no_history);
+ gdb::observers::new_thread.attach (mi_new_thread);
+ gdb::observers::thread_exit.attach (mi_thread_exit);
+ gdb::observers::inferior_added.attach (mi_inferior_added);
+ gdb::observers::inferior_appeared.attach (mi_inferior_appeared);
+ gdb::observers::inferior_exit.attach (mi_inferior_exit);
+ gdb::observers::inferior_removed.attach (mi_inferior_removed);
+ gdb::observers::record_changed.attach (mi_record_changed);
+ gdb::observers::normal_stop.attach (mi_on_normal_stop);
+ gdb::observers::target_resumed.attach (mi_on_resume);
+ gdb::observers::solib_loaded.attach (mi_solib_loaded);
+ gdb::observers::solib_unloaded.attach (mi_solib_unloaded);
+ gdb::observers::about_to_proceed.attach (mi_about_to_proceed);
+ gdb::observers::traceframe_changed.attach (mi_traceframe_changed);
+ gdb::observers::tsv_created.attach (mi_tsv_created);
+ gdb::observers::tsv_deleted.attach (mi_tsv_deleted);
+ gdb::observers::tsv_modified.attach (mi_tsv_modified);
+ gdb::observers::breakpoint_created.attach (mi_breakpoint_created);
+ gdb::observers::breakpoint_deleted.attach (mi_breakpoint_deleted);
+ gdb::observers::breakpoint_modified.attach (mi_breakpoint_modified);
+ gdb::observers::command_param_changed.attach (mi_command_param_changed);
+ gdb::observers::memory_changed.attach (mi_memory_changed);
+ gdb::observers::sync_execution_done.attach (mi_on_sync_execution_done);
+ gdb::observers::user_selected_context_changed.attach
(mi_user_selected_context_changed);
}
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 1716a7f..9c4e44b 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -52,7 +52,7 @@
#include "linespec.h"
#include "extension.h"
#include "gdbcmd.h"
-#include "observer.h"
+#include "observable.h"
#include "common/gdb_optional.h"
#include "common/byte-vector.h"
@@ -573,8 +573,8 @@ mi_cmd_thread_select (const char *command, char **argv, int argc)
/* Notify if the thread has effectively changed. */
if (!ptid_equal (inferior_ptid, previous_ptid))
{
- observer_notify_user_selected_context_changed (USER_SELECTED_THREAD
- | USER_SELECTED_FRAME);
+ gdb::observers::user_selected_context_changed.notify
+ (USER_SELECTED_THREAD | USER_SELECTED_FRAME);
}
}
@@ -2024,8 +2024,8 @@ mi_execute_command (const char *cmd, int from_tty)
if (report_change)
{
- observer_notify_user_selected_context_changed
- (USER_SELECTED_THREAD | USER_SELECTED_FRAME);
+ gdb::observers::user_selected_context_changed.notify
+ (USER_SELECTED_THREAD | USER_SELECTED_FRAME);
}
}
}