From 6f6484cd83d5d58fc72997d1d6a106f0bf359a04 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Sat, 3 Nov 2012 12:14:47 +0000 Subject: [PATCH] gdb: Fix PR gdb/14617. * breakpoint.c (trace_pass_set_count): Call observer_notify_breakpoint_modified instead of observer_notify_tracepoint_modified. * mi/mi-cmd-break.c (mi_cmd_break_passcount): Likewise. gdb/doc: * observer.texi (GDB Observers): Remove observer 'tracepoint_modified', 'tracepoint_created' and 'tracepoint_deleted'. gdb/testsuite: Fix PR gdb/14617. * gdb.mi/mi-breakpoint-changed.exp (test_insert_delete_modify): Remove setup_kfail, and update test. --- gdb/ChangeLog | 8 ++++++++ gdb/breakpoint.c | 2 +- gdb/doc/ChangeLog | 6 ++++++ gdb/doc/observer.texi | 15 --------------- gdb/mi/mi-cmd-break.c | 2 +- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp | 3 +-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0fc9a86816c..f7808a4c9bb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2012-11-03 Yao Qi + + Fix PR gdb/14617. + * breakpoint.c (trace_pass_set_count): Call + observer_notify_breakpoint_modified instead of + observer_notify_tracepoint_modified. + * mi/mi-cmd-break.c (mi_cmd_break_passcount): Likewise. + 2012-11-02 Tom Tromey * breakpoint.c (catch_syscall_completer): Pass 'word' as second diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 0023ba5a374..851dd8624a4 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -15245,7 +15245,7 @@ static void trace_pass_set_count (struct tracepoint *tp, int count, int from_tty) { tp->pass_count = count; - observer_notify_tracepoint_modified (tp->base.number); + observer_notify_breakpoint_modified (&tp->base); if (from_tty) printf_filtered (_("Setting tracepoint %d's passcount to %d\n"), tp->base.number, count); diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 82b1543b185..a717c5ad174 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,9 @@ +2012-11-03 Yao Qi + + * observer.texi (GDB Observers): Remove observer + 'tracepoint_modified', 'tracepoint_created' and + 'tracepoint_deleted'. + 2012-10-26 Tom Tromey * gdb.texinfo (General Query Packets): Use @itemx for QAgent. diff --git a/gdb/doc/observer.texi b/gdb/doc/observer.texi index 106475bd1be..50038ac36cf 100644 --- a/gdb/doc/observer.texi +++ b/gdb/doc/observer.texi @@ -179,21 +179,6 @@ A breakpoint has been modified in some way. The argument @var{b} is the modified breakpoint. @end deftypefun -@deftypefun void tracepoint_created (int @var{tpnum}) -A new tracepoint has been created. The argument @var{tpnum} is the -number of the newly-created tracepoint. -@end deftypefun - -@deftypefun void tracepoint_deleted (int @var{tpnum}) -A tracepoint has been destroyed. The argument @var{tpnum} is the -number of the newly-destroyed tracepoint. -@end deftypefun - -@deftypefun void tracepoint_modified (int @var{tpnum}) -A tracepoint has been modified in some way. The argument @var{tpnum} -is the number of the modified tracepoint. -@end deftypefun - @deftypefun void traceframe_changed (int @var{tfnum}, int @var{tpnum}) The trace frame is changed to @var{tfnum} (e.g., by using the @code{tfind} command). If @var{tfnum} is negative, it means diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c index 2fe84dcfecc..487d42d5472 100644 --- a/gdb/mi/mi-cmd-break.c +++ b/gdb/mi/mi-cmd-break.c @@ -200,7 +200,7 @@ mi_cmd_break_passcount (char *command, char **argv, int argc) if (t) { t->pass_count = p; - observer_notify_tracepoint_modified (n); + observer_notify_breakpoint_modified (&t->base); } else { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e3376d13166..ad0407dd3d6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2012-11-03 Yao Qi + + Fix PR gdb/14617. + * gdb.mi/mi-breakpoint-changed.exp (test_insert_delete_modify): + Remove setup_kfail, and update test. + 2012-11-02 Tom Tromey * gdb.base/catch-syscall.exp (do_syscall_tests): Add completion diff --git a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp index 773f588d5cd..ec10032eda9 100644 --- a/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp +++ b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp @@ -120,10 +120,9 @@ proc test_insert_delete_modify { } { {.*=breakpoint-modified,bkpt=\{number="5",.*,ignore=\"1\".*\}.*\n\^done} \ $test # 5. when modifying pass count. - setup_kfail gdb/14617 *-*-* set test "passcount 1 4" mi_gdb_test $test \ - {.*=breakpoint-modified,bkpt=\{number="4",.*\}.*\n\^done} \ + {.*=breakpoint-modified,bkpt=\{number="4",.*pass="1".*\}.*\n\^done} \ $test # Delete some breakpoints and verify that '=breakpoint-deleted -- 2.30.2