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.
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.
2013-01-22 Pedro Alves <palves@redhat.com>
* annotate.c: Include "inferior.h".
(frames_invalid_emitted)
(breakpoints_invalid_emitted): New globals.
(async_background_execution_p): New function.
(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.
suppress multiple breakpoints-invalid annotations when the ignore
count of a breakpoint changes, up until the target actually stops.
But, the code is bogus:
void
annotate_breakpoints_changed (void)
{
if (annotation_level == 2)
{
target_terminal_ours ();
printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
if (ignore_count_changed)
ignore_count_changed = 0; /* Avoid multiple break annotations. */
}
}
The "ignore_count_changed" flag isn't actually guarding the output of
the annotation at all. It would have been better written something
like:
void
annotate_breakpoints_changed (void)
{
if (annotation_level == 2 && !ignore_count_changed)
{
target_terminal_ours ();
printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
ignore_count_changed = 0; /* Avoid multiple break annotations. */
}
}
but, it wasn't. AFAICS, that goes all the way back to the original
patch'es submission and check in, at
<http://sourceware.org/ml/gdb-patches/1999-q4/msg00106.html>. I
looked a tar of HP's wdb from 1999, and even though that contains
local changes in the annotate code, this suppression seems borked
there too to me.
The original patch added a test to supposedly exercise this
suppression, but, it actually doesn't. It merely tests that
"breakpoints-invalid" is output after "stopped", but doesn't check
whether the duplicates supression actually works (IOW, check that only
_one_ annotation is seen). I was going to simply delete the tests
too, but a following patch will eliminate the duplicates in a
different way (which I needed for a different reason), so instead, I'm
making the tests actually fail if a duplicate annotation is seen.
Worry not, the test doesn't actually fail! The reason is that
breakpoint.c does:
else if (b->ignore_count > 0)
{
b->ignore_count--;
annotate_ignore_count_change ();
bs->stop = 0;
/* Increase the hit count even though we don't stop. */
++(b->hit_count);
observer_notify_breakpoint_modified (b);
}
where the annotate_ignore_count_change call is meant to inform the
"breakpoint_modified" annotation observer to ignore the notification.
All sounds good. But, the trouble is that nowadays annotate.c only
installs the observers if GDB is started with annotations enabled with
a command line option (gdb --annotate=2):
void
_initialize_annotate (void)
{
if (annotation_level == 2)
{
observer_attach_breakpoint_deleted (breakpoint_changed);
observer_attach_breakpoint_modified (breakpoint_changed);
}
}
and annota1.exp, to enable annotations, starts GDB normally, and
afterwards does "set annotate 2", so the observers aren't installed
when annota1.exp is run, and therefore changing the ignore count isn't
triggering any annotation at all...
gdb/
2013-01-22 Pedro Alves <palves@redhat.com>
* annotate.c (ignore_count_changed): Delete.
(annotate_breakpoints_changed): Don't clear ignore_count_changed.
(annotate_ignore_count_change): Delete.
(annotate_stopped): Don't emit a delayed breakpoints-changed
annotation.
* annotate.h (annotate_ignore_count_change): Delete.
* breakpoint.c (bpstat_check_breakpoint_conditions): Don't call
annotate_ignore_count_change.
gdb/testsuite/
2013-01-22 Pedro Alves <palves@redhat.com>
* gdb.base/annota1.exp (annotate ignore count change): Add
expected output for failure case.
Two modifications:
1. The addition of 2013 to the copyright year range for every file;
2. The use of a single year range, instead of potentially multiple
year ranges, as approved by the FSF.
merged changes from Foundry (list follows by file/author):
- Tom Tromey <tromey@cygnus.com>
* Makefile.in (gdbres.o): New target.
(WINDRES): New define.
* configure: Rebuilt.
* configure.in (WINDRES): Define.
(CONFIG_OBS): Include gdbres.o on Windows.
* gdbtool.ico: New file.
* gdb.rc: New file.
* ser-unix.c
- Keith Seitz <keiths@onions.cygnus.com>
(wait_for): Don't reset the timeout_remaining for CYGWIN32,
since we now effectively poll the serial port.
Don't reset the current_timeout, either, since this member is used
by hardwire_readchar to track the timeout and call the ui_loop_hook.
(hardwire_readchar): Poll the serial port for Cygwin32. We timeout every
second, update the UI, and loop around doing this until we have hit the real
timeout or we get data or an error. This will allow the UI to stay active
while gdb is "blocked" talking to the target.
- Martin M. Hunt <hunt@cygnus.com>
(wait_for): Do reset current_timeout
because it is only used to keep track of what the
current timeout for the scb is.
* top.c
- Martin M. Hunt <hunt@cygnus.com>
(quit_confirm): Change exit message again
for GUI.
(pc_changed_hook): Add prototype.
- Tom Tromey <tromey@cygnus.com>
(quit_confirm): Added missing `else'.
(quit_confirm): Special-case message if init_ui_hook is
set.
* symtab.c
- Martin M. Hunt <hunt@cygnus.com>
(find_pc_sect_line): If no symbol information
is found, return correct pc anyway.
(find_methods): Comment out an apparently
bogus error message because it messes up Foundry.
* serial.c
- Martin M. Hunt <hunt@cygnus.com>
(_initialize_serial): Add a description of
"set remotelogbase".
* findvar.c
- Martin M. Hunt <hunt@cygnus.com>
(write_register_gen): Add call to
pc_changed_hook if the PC is being changed.
* defs.h
- Martin M. Hunt <hunt@cygnus.com>
(pc_changed_hook): Define.
* command.c
- Martin M. Hunt <hunt@cygnus.com>
(do_setshow_command): If no arguments are supplied,
don't dump core, instead print out an error message.
* breakpoint.c
- Martin M. Hunt <hunt@cygnus.com>
Make set_raw_breakpoint, set_breakpoint_count,
and breakpoint_count non-static so they are accessible from
gdbtk.c.
(enable_breakpoint): Enable breakpoint
with same disposition instead of changing all breakpoints
to donttouch.
* annotate.h
- Keith Seitz <keiths@onions.cygnus.com>
Add declarations for annotation hooks.
* annotate.c
- Keith Seitz <keiths@onions.cygnus.com>
Add hooks: annotate_starting_hook, annotate_stopped_hook,
annotate_signalled_hook, annotate_exited_hook.
(annotate_starting): If hook exists, call it instead.
(annotate_stopped): If hook exists, call it instead.
(annotate_exited): If hook exists, call it instead.
(annotate_signalled): If hook exists, call it instead.
Sat Mar 21 19:34:49 1998 Elena Zannoni <ezannoni@kwikemart.cygnus.com>
Merged changes from Foundry: list follows by author:
- Tom Tromey <tromey@cygnus.com>
* Makefile.in (gdbres.o): New target.
(WINDRES): New define.
* configure: Rebuilt.
* configure.in (WINDRES): Define.
(CONFIG_OBS): Include gdbres.o on Windows.
* gdbtool.ico: New file.
* gdb.rc: New file.
* gdbtk.c (gdbtk_init): Call ide_create_messagebox_command.
(gdbtk_cleanup): Call ide_interface_deregister_all.
(gdbtk_init): Pass event handle to cleanup.
(TclDebug): Use Tcl_Merge to construct command.
(gdbtk_init): Call ide_create_cygwin_path_command.
- Martin M. Hunt <hunt@cygnus.com>
* gdbtk.c (gdb_set_bp): Set addr_string for bp.
(gdb_get_breakpoint_info): Demangle function
names in breakpoint info.
Include "demangle.h".
(gdb_loc, gdb_listfuncs): Demangle C++
function names.
(gdb_set_bp): Properly quote filename to fix
problems with spaces. Send pc back as a hex string.
(gdb_listfuncs): Remove debugging line.
Turn off some debugging lines.
(breakpoint_notify): Return correct line number.
(gdb_get_breakpoint_info): Return correct line number.
(gdb_set_bp): New function to provide a better way to
set breakpoints.
(gdbtk_readline, gdbtk_readline_begin): Memory
allocated by tcl needs to be freed by Tcl_Free().
(find_file_in_dir): Deleted.
(gdb_find_file_command): Call full_lookup_symtab().
(gdb_listfuncs): Call full_lookup_symtab().
(full_lookup_symtab): New function. Like lookup_symtab
except handles multiple files with the same basename,
full pathnames, and always sets symtab->fullname.
(gdb_loadfile): Call full_lookup_symtab(). Clear
realloc'd memory.
(gdb_loadfile): Don't tag lines without source.
Tag source lines with source_tag.
(gdb_find_file_command, find_file_in_dir):
Rewrite. Now searches symtabs and psymtabs for a match
on the partial or full filename. Returns the full pathname.
(gdb_loadfile): Realloc additional memory
if someone loads in a file with more than 160,000
lines. I don't know if this really works because
I don't have enough memory to test it.
(gdb_sourcelines): Deleted.
(gdb_loadfile): New function. Takes a text widget
and loads it with the contents of a file. Marks
and tags source lines.
(pc_changed): New function.
(get_pc_register): Returns the value of
the PC to GDB.
(gdb_loc): If looking on the stack, return
real pc along with calling source line.
(gdb_loc): Return "" instead of "N/A" if
filename is not found.
(gdb_get_breakpoint_info): Same.
(get_register): For Natural mode, set format to 0.
Minor bugfixes from keiths.
(TclDebug): New function for debugging use.
(gdb_loc): Return correct PC for frames
that are not the innermost frame.
(gdb_listfiles): Rewritten to use object
API. Now takes an optional dirname which will cause
only files in that directory or its subdirectories
to be returned. Now returns basenames instead of
full pathnames.
(gdb_cmd): Set/reset load_in_progress flag.
(call_wrapper): Don't pop up dialog for errors in
downloads; just abort download.
(gdbtk_load_hash): Set return value correctly.
- Keith Seitz <keiths@onions.cygnus.com>
* gdbtk.c (gdbtk_init): Define the ui_loop_hook so that it can be
called by routines which might block, allowing us to update the GUI.
(gdbtk_wait): Move timer calls to annotation hooks.
(gdbtk_init): Define the annotation hooks.
(gdbtk_annotate_starting): New function for cygwin32 hosts.
(gdbtk_annotate_stopped): New function for cygwin32 hosts.
(gdbtk_annotate_exited): New function for cygwin32 hosts.
(gdbtk_annotate_signalled): New function. for cygwin32 hosts.
(gdbtk_init): Use gdbtk_print_frame_info hook.
(gdbtk_print_frame_info): New function which sets current_source_symtab
based on the given symtab and line info.
(gdb_immediate_command): New function which does
not buffer any
output. (Contrast to gdb_cmd.)
(gdb_prompt_command): New function to return gdb's prompt.
(find_file_in_dir): New functon which searches source paths
for a given filename.
(gdb_find_file): New function which returns path to given file -- uses
find_file_in_dir.
(gdbtk_init): Install "gdb_immediate", "gdb_find_file", and
"gdb_prompt"
commands into interpreter.
- Ian Lance Taylor <ian@cygnus.com>
* gdbtk.c (gdbtk_timer_going): If __CYGWIN32__, new static
variable.
(gdb_cmd): If __CYGWIN32__, if executing the load command, call
gdbtk_start_timer and gdbtk_stop_timer.
(call_wrapper): If __CYGWIN32__, if the timer is going, turn it
off. Clear load_in_progress.
(x_event): If load_in_progress, quit if download_cancel_ok.
(gdbtk_start_timer): Set gdbtk_timer_going.
(gdbtk_stop_timer): Clear gdbtk_timer_going.
(gdbtk_wait): Call x_event.
(gdbtk_init): Call ide_create_win_grab_command if
__CYGIN32__.
(gdb_clear_file): Clear stop_pc.
