aboutsummaryrefslogtreecommitdiff
path: root/gdb/annotate.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2013-01-22 20:19:40 +0000
committerPedro Alves <palves@redhat.com>2013-01-22 20:19:40 +0000
commit9c97429fb1870f53e69556e967d01ce01116b35e (patch)
tree15efcb9b83fb956edfffec9d50002abb91811e87 /gdb/annotate.c
parentbd00c69423eff0d06f1632cfb50ccb5d8ab58151 (diff)
downloadgdb-9c97429fb1870f53e69556e967d01ce01116b35e.zip
gdb-9c97429fb1870f53e69556e967d01ce01116b35e.tar.gz
gdb-9c97429fb1870f53e69556e967d01ce01116b35e.tar.bz2
All annotate_breakpoints_changed calls are along-side
observer_notify_breakpoints_changed calls. All, except the init_raw_breakpoint one. But that one is actually wrong. The breakpoint is being constructed at that point, and hasn't been placed on the breakpoint chain yet. It would be better placed in install_breakpoint, and I actually started out that way. But once the annotate_breakpoints_changed are parallel to the observer calls, we can fully move annotations to observers too. One issue is that this changes the order of annotations a bit. Before, we'd emit the annotation, and after call "mention()" on the breakpoint (which prints the breakpoint number, etc.). But, we call the observers _after_ mention is called, so the annotation output will change a little: void install_breakpoint (int internal, struct breakpoint *b, int update_gll) { add_to_breakpoint_chain (b); set_breakpoint_number (internal, b); if (is_tracepoint (b)) set_tracepoint_count (breakpoint_count); if (!internal) mention (b); observer_notify_breakpoint_created (b); if (update_gll) update_global_location_list (1); } I believe this order doesn't really matter (the frontend needs to wait for the prompt anyway), so I just adjust the expected output in the tests. Emacs in annotations mode doesn't seem to complain. Couple that with the previous patch that suppressed duplicated annotations, and, the fact that some annotations calls were actually missing (were we do have observer calls), more changes to the tests are needed anyway. Tested on x86_64 Fedora 17. gdb/ 2013-01-22 Pedro Alves <palves@redhat.com> * annotate.c (annotate_breakpoints_changed): Rename to ... (annotate_breakpoints_invalid): ... this. Make static. (breakpoint_changed): Adjust. (_initialize_annotate): Always install the observers. Install a "breakpoint_created" observer. * annotate.h (annotate_breakpoints_changed): Delete declaration. * breakpoint.c (set_breakpoint_condition) (breakpoint_set_commands, do_map_commands_command) (init_raw_breakpoint, clear_command, set_ignore_count) (enable_breakpoint_disp): No longer call annotate_breakpoints_changed. gdb/testsuite/ 2013-01-22 Pedro Alves <palves@redhat.com> * gdb.base/annota1.exp (breakpoints_invalid): New variable. Adjust tests to breakpoints-invalid changes. * gdb.cp/annota2.exp (breakpoints_invalid, frames_invalid): New variables. Adjust tests to breakpoints-invalid changes.
Diffstat (limited to 'gdb/annotate.c')
-rw-r--r--gdb/annotate.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/gdb/annotate.c b/gdb/annotate.c
index 387467b..d82daa2 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -63,9 +63,9 @@ print_value_flags (struct type *t)
else
printf_filtered (("-"));
}
-
-void
-annotate_breakpoints_changed (void)
+
+static void
+annotate_breakpoints_invalid (void)
{
if (annotation_level == 2
&& (!breakpoints_invalid_emitted
@@ -575,15 +575,13 @@ annotate_display_prompt (void)
static void
breakpoint_changed (struct breakpoint *b)
{
- annotate_breakpoints_changed ();
+ annotate_breakpoints_invalid ();
}
void
_initialize_annotate (void)
{
- if (annotation_level == 2)
- {
- observer_attach_breakpoint_deleted (breakpoint_changed);
- observer_attach_breakpoint_modified (breakpoint_changed);
- }
+ observer_attach_breakpoint_created (breakpoint_changed);
+ observer_attach_breakpoint_deleted (breakpoint_changed);
+ observer_attach_breakpoint_modified (breakpoint_changed);
}