From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7369 invoked by alias); 21 Nov 2012 20:14:41 -0000 Received: (qmail 7295 invoked by uid 22791); 21 Nov 2012 20:14:39 -0000 X-SWARE-Spam-Status: No, hits=-7.8 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 21 Nov 2012 20:14:31 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qALKEVCU005459 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 21 Nov 2012 15:14:31 -0500 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qALKEUdn032551 for ; Wed, 21 Nov 2012 15:14:30 -0500 Subject: [PATCH 2/4] Suppress repeated annotations until GDB is ready to accept input. To: gdb-patches@sourceware.org From: Pedro Alves Date: Wed, 21 Nov 2012 20:14:00 -0000 Message-ID: <20121121201429.1015.6037.stgit@brno.lan> In-Reply-To: <20121121201416.1015.36832.stgit@brno.lan> References: <20121121201416.1015.36832.stgit@brno.lan> User-Agent: StGit/0.16 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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/msg00587.txt.bz2 With some changes to how software single-step (SSS) breakpoints are handled, one of those being to place SSS breakpoints on the breakpoint chain as all other breakpoints, annota1.exp times out with lots and lots of breakpoint-invalid and frame-changed annotations. All those extra annotations are actually unnecessary. For one, SSS breakpoints are internal breakpoints, so the frontend shouldn't care if they were added, removed or changed. Then, there's really no point in emitting "breakpoints-invalid" or "frames-invalid" more than once between times the frontend/user can actually issues GDB commands; the frontend will have to wait for the GDB prompt to refresh its state, so emitting those annotations at most once between prompts is enough. Non-stop or async would complicate this, but no frontend will be using annotations in those modes (one of goes of emacs switching to MI was non-stop mode support, AFAIK). The previous patch reveals there has been an intention in the past to suppress multiple breakpoints-invalid annotations caused by ignore count changes. As the previous patch shows, that's always been broken, but in any case, this patch actually makes it work. The next patch will remove several annotation-specific calls in breakpoint.c in favor of always using the breakpoint modified & friends observers, and that causes yet more of these annotations, because several calls to the corresponding annotate_* functions in breakpoint.c are missing, particularly in newer code. So all in all, here's a simple mechanism that avoids sending the same annotation to the frontend more than once until gdb is ready to accept further commands. Tested on x86_64 Fedora 17. 2012-11-21 Pedro Alves * annotate.c (frames_invalid_emitted) (breakpoints_invalid_emitted): New globals. (annotate_breakpoints_changed, annotate_frames_invalid): Skip emitting the annotation if it has already been emitted. (annotate_display_prompt): New function. * annotate.h (annotate_display_prompt): New declaration. * event-top.c: Include annotate.h. (display_gdb_prompt): Call annotate_display_prompt. --- gdb/annotate.c | 23 +++++++++++++++++++++-- gdb/annotate.h | 2 ++ gdb/event-top.c | 3 +++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/gdb/annotate.c b/gdb/annotate.c index a222736..3c7acb9 100644 --- a/gdb/annotate.c +++ b/gdb/annotate.c @@ -38,6 +38,12 @@ static void breakpoint_changed (struct breakpoint *b); void (*deprecated_annotate_signalled_hook) (void); void (*deprecated_annotate_signal_hook) (void); +/* Booleans indicating whether we've emitted certain notifications. + Used to suppress useless repeated notifications until the next time + we're ready to accept more commands. */ +static int frames_invalid_emitted; +static int breakpoints_invalid_emitted; + static void print_value_flags (struct type *t) { @@ -50,10 +56,11 @@ print_value_flags (struct type *t) void annotate_breakpoints_changed (void) { - if (annotation_level == 2) + if (annotation_level == 2 && !breakpoints_invalid_emitted) { target_terminal_ours (); printf_unfiltered (("\n\032\032breakpoints-invalid\n")); + breakpoints_invalid_emitted = 1; } } @@ -185,10 +192,11 @@ annotate_breakpoints_table_end (void) void annotate_frames_invalid (void) { - if (annotation_level == 2) + if (annotation_level == 2 && !frames_invalid_emitted) { target_terminal_ours (); printf_unfiltered (("\n\032\032frames-invalid\n")); + frames_invalid_emitted = 1; } } @@ -538,6 +546,17 @@ annotate_array_section_end (void) printf_filtered (("\n\032\032array-section-end\n")); } +/* Called when GDB is about to display the prompt. Used to reset + annotation suppression whenever we're ready to accept new + frontend/user commands. */ + +void +annotate_display_prompt (void) +{ + frames_invalid_emitted = 0; + breakpoints_invalid_emitted = 0; +} + static void breakpoint_changed (struct breakpoint *b) { diff --git a/gdb/annotate.h b/gdb/annotate.h index 443d892..15064b1 100644 --- a/gdb/annotate.h +++ b/gdb/annotate.h @@ -45,6 +45,8 @@ extern void annotate_frames_invalid (void); extern void annotate_new_thread (void); extern void annotate_thread_changed (void); +extern void annotate_display_prompt (void); + struct type; extern void annotate_field_begin (struct type *); diff --git a/gdb/event-top.c b/gdb/event-top.c index 5c533e4..2f0bbf7 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -36,6 +36,7 @@ #include "observer.h" #include "continuations.h" #include "gdbcmd.h" /* for dont_repeat() */ +#include "annotate.h" /* readline include files. */ #include "readline/readline.h" @@ -232,6 +233,8 @@ display_gdb_prompt (char *new_prompt) char *actual_gdb_prompt = NULL; struct cleanup *old_chain; + annotate_display_prompt (); + /* Reset the nesting depth used when trace-commands is set. */ reset_command_nest_depth ();