From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 467 invoked by alias); 2 Nov 2012 06:38:02 -0000 Received: (qmail 386 invoked by uid 22791); 2 Nov 2012 06:38:00 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 02 Nov 2012 06:37:53 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1TUAt6-0002SH-C4 from Yao_Qi@mentor.com ; Thu, 01 Nov 2012 23:37:52 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 1 Nov 2012 23:37:52 -0700 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.1.289.1; Thu, 1 Nov 2012 23:37:51 -0700 Message-ID: <50936A39.8080804@codesourcery.com> Date: Fri, 02 Nov 2012 06:38:00 -0000 From: Yao Qi User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Tom Tromey CC: Subject: Re: [PATCH] Fix PR14617: New MI notification on tracepoint modified. References: <1350556586-12800-1-git-send-email-yao@codesourcery.com> <87txt9qdbf.fsf@fleche.redhat.com> In-Reply-To: <87txt9qdbf.fsf@fleche.redhat.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-11/txt/msg00033.txt.bz2 On 11/02/2012 04:27 AM, Tom Tromey wrote: > Yao> +@item =tracepoint-modified,bkpt=@{number=@var{id},passcount=@var{count}@} > > print_one_breakpoint_location names the field "pass". > I think consistency would be good. What do you think? Tom, Inspired by your comments, 'breakpoint-modified' notification has covered tracepoint modification, which I didn't realize. This version is much simpler because we can put tracepoint object to function observer_notify_breakpoint_modified, and "pass" field appears in the MI notification. On the other hand, existing observers tracepoint_{created,deleted,modified} are useless, so they are removed in this patch as well. Regression tested on x86_64-linux. Is it OK? -- Yao gdb: 2012-11-02 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. gdb/doc: 2012-11-02 Yao Qi * observer.texi (GDB Observers): Remove observer 'tracepoint_modified', 'tracepoint_created' and 'tracepoint_deleted'. gdb/testsuite: 2012-11-02 Yao Qi Fix PR gdb/14617. * gdb.mi/mi-breakpoint-changed.exp (test_insert_delete_modify): Remove setup_kfail, and update test. --- gdb/breakpoint.c | 2 +- gdb/doc/observer.texi | 15 --------------- gdb/mi/mi-cmd-break.c | 2 +- gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp | 3 +-- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 76e3e89..1d79d6a 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/observer.texi b/gdb/doc/observer.texi index 106475b..50038ac 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 2fe84dc..487d42d 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/gdb.mi/mi-breakpoint-changed.exp b/gdb/testsuite/gdb.mi/mi-breakpoint-changed.exp index 773f588..ec10032 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 -- 1.7.7.6