X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fannotate.c;h=495aa2dba68d2d851ab45ff156809fddccf35ffd;hb=dbbc8b7e629fa666affd9a3f475d0bf6e5264677;hp=cd0a94aedaf0c2aaba2869df6e7cecf4abf6899d;hpb=0b30217134add051e159a192066a1e568ebd837f;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/annotate.c b/gdb/annotate.c
index cd0a94aeda..495aa2dba6 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -1,6 +1,5 @@
 /* Annotation routines for GDB.
-   Copyright (C) 1986, 1989-1992, 1994-1996, 1998-2000, 2007-2012 Free
-   Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,13 +22,14 @@
 #include "target.h"
 #include "gdbtypes.h"
 #include "breakpoint.h"
-#include "observer.h"
+#include "observable.h"
+#include "inferior.h"
+#include "infrun.h"
+#include "top.h"
 
 
 /* Prototypes for local functions.  */
 
-extern void _initialize_annotate (void);
-
 static void print_value_flags (struct type *);
 
 static void breakpoint_changed (struct breakpoint *b);
@@ -38,7 +38,12 @@ static void breakpoint_changed (struct breakpoint *b);
 void (*deprecated_annotate_signalled_hook) (void);
 void (*deprecated_annotate_signal_hook) (void);
 
-static int ignore_count_changed = 0;
+/* 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.  Reset whenever a prompt is
+   displayed.  */
+static int frames_invalid_emitted;
+static int breakpoints_invalid_emitted;
 
 static void
 print_value_flags (struct type *t)
@@ -48,30 +53,27 @@ print_value_flags (struct type *t)
   else
     printf_filtered (("-"));
 }
-
-void
-breakpoints_changed (void)
+
+static void
+annotate_breakpoints_invalid (void)
 {
-  if (annotation_level == 2)
+  if (annotation_level == 2
+      && (!breakpoints_invalid_emitted
+	  || current_ui->prompt_state != PROMPT_BLOCKED))
     {
-      target_terminal_ours ();
+      /* If the inferior owns the terminal (e.g., we're resuming),
+	 make sure to leave with the inferior still owning it.  */
+      int was_inferior = target_terminal::is_inferior ();
+
+      target_terminal::ours_for_output ();
+
       printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
-      if (ignore_count_changed)
-	ignore_count_changed = 0;   /* Avoid multiple break annotations.  */
-    }
-}
 
-/* The GUI needs to be informed of ignore_count changes, but we don't
-   want to provide successive multiple breakpoints-invalid messages
-   that are all caused by the fact that the ignore count is changing
-   (which could keep the GUI very busy).  One is enough, after the
-   target actually "stops".  */
+      if (was_inferior)
+	target_terminal::inferior ();
 
-void
-annotate_ignore_count_change (void)
-{
-  if (annotation_level > 1)
-    ignore_count_changed = 1;
+      breakpoints_invalid_emitted = 1;
+    }
 }
 
 void
@@ -107,11 +109,6 @@ annotate_stopped (void)
 {
   if (annotation_level > 1)
     printf_filtered (("\n\032\032stopped\n"));
-  if (annotation_level > 1 && ignore_count_changed)
-    {
-      ignore_count_changed = 0;
-      breakpoints_changed ();
-    }
 }
 
 void
@@ -207,10 +204,22 @@ annotate_breakpoints_table_end (void)
 void
 annotate_frames_invalid (void)
 {
-  if (annotation_level == 2)
+  if (annotation_level == 2
+      && (!frames_invalid_emitted
+	  || current_ui->prompt_state != PROMPT_BLOCKED))
     {
-      target_terminal_ours ();
+      /* If the inferior owns the terminal (e.g., we're resuming),
+	 make sure to leave with the inferior still owning it.  */
+      int was_inferior = target_terminal::is_inferior ();
+
+      target_terminal::ours_for_output ();
+
       printf_unfiltered (("\n\032\032frames-invalid\n"));
+
+      if (was_inferior)
+	target_terminal::inferior ();
+
+      frames_invalid_emitted = 1;
     }
 }
 
@@ -560,18 +569,30 @@ 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)
 {
-  breakpoints_changed ();
+  if (b->number <= 0)
+    return;
+
+  annotate_breakpoints_invalid ();
 }
 
 void
 _initialize_annotate (void)
 {
-  if (annotation_level == 2)
-    {
-      observer_attach_breakpoint_deleted (breakpoint_changed);
-      observer_attach_breakpoint_modified (breakpoint_changed);
-    }
+  gdb::observers::breakpoint_created.attach (breakpoint_changed);
+  gdb::observers::breakpoint_deleted.attach (breakpoint_changed);
+  gdb::observers::breakpoint_modified.attach (breakpoint_changed);
 }