aboutsummaryrefslogtreecommitdiff
path: root/gdb/mi/mi-out.c
diff options
context:
space:
mode:
authorVladimir Prus <vladimir@codesourcery.com>2011-04-27 10:17:39 +0000
committerVladimir Prus <vladimir@codesourcery.com>2011-04-27 10:17:39 +0000
commit8d3788bd590aa066f4f8383b7f8da20211e4ea9e (patch)
tree70a6d9187ed169486305055cf406ee9d0a79c08f /gdb/mi/mi-out.c
parentb4e7b88557a669c6a400014f406fcf5a5abb5290 (diff)
downloadgdb-8d3788bd590aa066f4f8383b7f8da20211e4ea9e.zip
gdb-8d3788bd590aa066f4f8383b7f8da20211e4ea9e.tar.gz
gdb-8d3788bd590aa066f4f8383b7f8da20211e4ea9e.tar.bz2
MI breakpoint notifications.
* annotate.c (breakpoint_changed): Adjust parameter type. * breakpoint.c (set_breakpoint_condition): Adjust to change in breakpoint_modified type. (breakpoint_set_commands): Likewise. (do_map_commands_command): Likewise. (bpstat_check_breakpoint_conditions): Notify that breakpoint has changed after bumping hit count. (bpstat_stop_status): Likewise. (print_one_breakpoint_location): Don't wrap in tuple here. (print_one_breakpoint): Always print individual locations. For locations, use unnamed tuple. (disable_breakpoints_in_unloaded_shlib): Notify that breakpoint has changed. (create_catchpoint, create_syscall_event_catchpoint): Call breakpoint_created obsever. (mention): Don't call breakpoint_created observer. (create_breakpoint_sal): Call breakpoint_created observer. (create_breakpoint, watch_command_1): Likewise. (create_ada_exception_breakpoint): Likewise. (delete_breakpoint): Call breakpoint_deleted breakpoint. (locations_are_equal): New. (update_breakpoint_locations): If locations were changed, notify. (set_ignore_count, disable_breakpoint, do_enable_breakpoint): Call breakpoint_modified observer. * mi/mi-cmd-break.c (breakpoint_notify): Adjust. (mi_cmd_break_insert): Don't set observers for modify and delete. * mi/mi-interp.c (mi_suppress_breakpoint_notifications): New. (mi_breakpoint_created, mi_breakpoint_deleted) (mi_breakpoint_modified): New. (mi_interpreter_init): Hook the above. * mi/mi-main.c (mi_cmd_execute): Disable breakpoint notifications while -break-* commands are executing. * mi/mi-main.h (mi_suppress_breakpoint_notifications): New. * mi/mi-out.c (struct ui_out_data): New field original_buffer. (mi_redirect): New. (mi_ui_out_impl): Hook in mi_redirect. (mi_field_skip): True to the name, skip the field, don't output a field with an empty value. * python/py-breakpoint.c (gdbpy_breakpoint_created) (gdbpy_breakpoint_deleted): Adjust. * tui/tui-hooks.c (tui_event_create_breakpoint) (tui_event_delete_breakpoint, tui_event_modify_breakpoint): Adjust.
Diffstat (limited to 'gdb/mi/mi-out.c')
-rw-r--r--gdb/mi/mi-out.c28
1 files changed, 22 insertions, 6 deletions
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index 9aaeec6..ea77e50 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -30,6 +30,7 @@ struct ui_out_data
int suppress_output;
int mi_version;
struct ui_file *buffer;
+ struct ui_file *original_buffer;
};
typedef struct ui_out_data mi_out_data;
@@ -63,6 +64,7 @@ static void mi_message (struct ui_out *uiout, int verbosity,
ATTRIBUTE_PRINTF (3, 0);
static void mi_wrap_hint (struct ui_out *uiout, char *identstring);
static void mi_flush (struct ui_out *uiout);
+static int mi_redirect (struct ui_out *uiout, struct ui_file *outstream);
/* This is the MI ui-out implementation functions vector */
@@ -86,7 +88,7 @@ struct ui_out_impl mi_ui_out_impl =
mi_message,
mi_wrap_hint,
mi_flush,
- NULL,
+ mi_redirect,
1, /* Needs MI hacks. */
};
@@ -210,11 +212,6 @@ void
mi_field_skip (struct ui_out *uiout, int fldno, int width,
enum ui_align alignment, const char *fldname)
{
- mi_out_data *data = ui_out_data (uiout);
-
- if (data->suppress_output)
- return;
- mi_field_string (uiout, fldno, width, alignment, fldname, "");
}
/* other specific mi_field_* end up here so alignment and field
@@ -294,6 +291,25 @@ mi_flush (struct ui_out *uiout)
gdb_flush (data->buffer);
}
+int
+mi_redirect (struct ui_out *uiout, struct ui_file *outstream)
+{
+ mi_out_data *data = ui_out_data (uiout);
+
+ if (outstream != NULL)
+ {
+ data->original_buffer = data->buffer;
+ data->buffer = outstream;
+ }
+ else if (data->original_buffer != NULL)
+ {
+ data->buffer = data->original_buffer;
+ data->original_buffer = NULL;
+ }
+
+ return 0;
+}
+
/* local functions */
/* access to ui_out format private members */