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/testsuite/gdb.gdb | |
parent | 194ed4130dadb7dd1668f6af87405bdcd8041199 (diff) | |
download | fsf-binutils-gdb-76727919ceb590f03ff0f6db08b7ceab5b7aeaff.zip fsf-binutils-gdb-76727919ceb590f03ff0f6db08b7ceab5b7aeaff.tar.gz fsf-binutils-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/testsuite/gdb.gdb')
-rw-r--r-- | gdb/testsuite/gdb.gdb/observer.exp | 143 |
1 files changed, 0 insertions, 143 deletions
diff --git a/gdb/testsuite/gdb.gdb/observer.exp b/gdb/testsuite/gdb.gdb/observer.exp deleted file mode 100644 index 1b51464..0000000 --- a/gdb/testsuite/gdb.gdb/observer.exp +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 2003-2018 Free Software Foundation, Inc. - -# 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/>. - -# This file was written by Joel Brobecker (brobecker@gnat.com), derived -# from xfullpath.exp. - -load_lib selftest-support.exp - -proc attach_first_observer { message } { - gdb_test_no_output "set \$first_obs = observer_attach_test_notification (&observer_test_first_notification_function)" \ - "$message; attach first observer" -} - -proc attach_second_observer { message } { - gdb_test_no_output "set \$second_obs = observer_attach_test_notification (&observer_test_second_notification_function)" \ - "$message; attach second observer" -} - -proc attach_third_observer { message } { - gdb_test_no_output "set \$third_obs = observer_attach_test_notification (&observer_test_third_notification_function)" \ - "$message; attach third observer" -} - -proc detach_first_observer { message } { - gdb_test_no_output "call observer_detach_test_notification (\$first_obs)" \ - "$message; detach first observer" -} - -proc detach_second_observer { message } { - gdb_test_no_output "call observer_detach_test_notification (\$second_obs)" \ - "$message; detach second observer" -} - -proc detach_third_observer { message } { - gdb_test_no_output "call observer_detach_test_notification (\$third_obs)" \ - "$message; detach third observer" -} - -proc check_counters { first second third message } { - gdb_test "print observer_test_first_observer" \ - ".\[0-9\]+ =.*$first" \ - "$message; check first observer counter value" - gdb_test "print observer_test_second_observer" \ - ".\[0-9\]+ =.*$second" \ - "$message; check second observer counter value" - gdb_test "print observer_test_third_observer" \ - ".\[0-9\]+ =.*$third" \ - "$message; check third observer counter value" -} - -proc reset_counters { message } { - gdb_test_no_output "set variable observer_test_first_observer = 0" \ - "$message; reset first observer counter" - gdb_test_no_output "set variable observer_test_second_observer = 0" \ - "$message; reset second observer counter" - gdb_test_no_output "set variable observer_test_third_observer = 0" \ - "$message; reset third observer counter" -} - -proc test_notifications { first second third message args } { - # Do any initialization - for {set i 0} {$i < [llength $args]} {incr i} { - [lindex $args $i] $message - } - reset_counters $message - # Call observer_notify_test_notification. Note that this procedure - # takes one argument, but this argument is ignored by the observer - # callbacks we have installed. So we just pass an arbitrary value. - gdb_test_no_output "call observer_notify_test_notification (0)" \ - "$message; sending notification" - check_counters $first $second $third $message -} - -proc test_observer {} { - # First, try sending a notification without any observer attached. - test_notifications 0 0 0 "no observer attached" - - # Now, attach one observer, and send a notification. - test_notifications 0 1 0 "second observer attached" \ - attach_second_observer - - # Remove the observer, and send a notification. - test_notifications 0 0 0 "second observer detached" \ - detach_second_observer - - # With a new observer. - test_notifications 1 0 0 "1st observer added" \ - attach_first_observer - - # With 2 observers. - test_notifications 1 1 0 "2nd observer added" \ - attach_second_observer - - # With 3 observers. - test_notifications 1 1 1 "3rd observer added" \ - attach_third_observer - - # Remove middle observer. - test_notifications 1 0 1 "2nd observer removed" \ - detach_second_observer - - # Remove first observer. - test_notifications 0 0 1 "1st observer removed" \ - detach_first_observer - - # Remove last observer. - test_notifications 0 0 0 "3rd observer removed" \ - detach_third_observer - - # Go back to 3 observers, and remove them in a different order... - test_notifications 1 1 1 "three observers added" \ - attach_first_observer \ - attach_second_observer \ - attach_third_observer - - # Remove the third observer. - test_notifications 1 1 0 "third observer removed" \ - detach_third_observer - - # Remove the second observer. - test_notifications 1 0 0 "second observer removed" \ - detach_second_observer - - # Remove the first observer, no more observers. - test_notifications 0 0 0 "first observer removed" \ - detach_first_observer - - return 0 -} - -do_self_tests captured_main test_observer |