X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fosdata.c;h=066d47fa56fc53a6d6ad59bda2580a02af2072ce;hb=1c658ad5fac2a221b589cbe26ec84c788b24a8d1;hp=06506dddbafc64469ff98ad216e4acbc084d68bb;hpb=0fb0cc7590113e9b459dfcc48dc71c9d419d9580;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/osdata.c b/gdb/osdata.c index 06506dddba..066d47fa56 100644 --- a/gdb/osdata.c +++ b/gdb/osdata.c @@ -1,6 +1,6 @@ /* Routines for handling XML generic OS data provided by target. - Copyright (C) 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2008-2012 Free Software Foundation, Inc. This file is part of GDB. @@ -68,7 +68,7 @@ osdata_start_osdata (struct gdb_xml_parser *parser, if (data->osdata) gdb_xml_error (parser, _("Seen more than on osdata element")); - type = VEC_index (gdb_xml_value_s, attributes, 0)->value; + type = xml_find_attribute (attributes, "type")->value; osdata = XZALLOC (struct osdata); osdata->type = xstrdup (type); data->osdata = osdata; @@ -83,6 +83,7 @@ osdata_start_item (struct gdb_xml_parser *parser, { struct osdata_parsing_data *data = user_data; struct osdata_item item = { NULL }; + VEC_safe_push (osdata_item_s, data->osdata->items, &item); } @@ -94,7 +95,8 @@ osdata_start_column (struct gdb_xml_parser *parser, void *user_data, VEC(gdb_xml_value_s) *attributes) { struct osdata_parsing_data *data = user_data; - const char *name = VEC_index (gdb_xml_value_s, attributes, 0)->value; + const char *name = xml_find_attribute (attributes, "name")->value; + data->property_name = xstrdup (name); } @@ -123,6 +125,7 @@ static void clear_parsing_data (void *p) { struct osdata_parsing_data *data = p; + osdata_free (data->osdata); data->osdata = NULL; xfree (data->property_name); @@ -165,23 +168,21 @@ const struct gdb_xml_element osdata_elements[] = { struct osdata * osdata_parse (const char *xml) { - struct gdb_xml_parser *parser; - struct cleanup *before_deleting_result, *back_to; + struct cleanup *back_to; struct osdata_parsing_data data = { NULL }; - back_to = make_cleanup (null_cleanup, NULL); - parser = gdb_xml_create_parser_and_cleanup (_("osdata"), - osdata_elements, &data); - gdb_xml_use_dtd (parser, "osdata.dtd"); + back_to = make_cleanup (clear_parsing_data, &data); - before_deleting_result = make_cleanup (clear_parsing_data, &data); - - if (gdb_xml_parse (parser, xml) == 0) - /* Parsed successfully, don't need to delete the result. */ - discard_cleanups (before_deleting_result); + if (gdb_xml_parse_quick (_("osdata"), "osdata.dtd", + osdata_elements, xml, &data) == 0) + { + /* Parsed successfully, don't need to delete the result. */ + discard_cleanups (back_to); + return data.osdata; + } do_cleanups (back_to); - return data.osdata; + return NULL; } #endif @@ -192,6 +193,7 @@ osdata_item_clear (struct osdata_item *item) { struct osdata_column *col; int ix; + for (ix = 0; VEC_iterate (osdata_column_s, item->columns, ix, col); @@ -215,6 +217,7 @@ osdata_free (struct osdata *osdata) { struct osdata_item *item; int ix; + for (ix = 0; VEC_iterate (osdata_item_s, osdata->items, ix, item); @@ -230,6 +233,7 @@ static void osdata_free_cleanup (void *arg) { struct osdata *osdata = arg; + osdata_free (osdata); } @@ -244,12 +248,18 @@ get_osdata (const char *type) { struct osdata *osdata = NULL; char *xml = target_get_osdata (type); + if (xml) { struct cleanup *old_chain = make_cleanup (xfree, xml); if (xml[0] == '\0') - warning (_("Empty data returned by target. Wrong osdata type?")); + { + if (type) + warning (_("Empty data returned by target. Wrong osdata type?")); + else + warning (_("Empty type list returned by target. No type data?")); + } else osdata = osdata_parse (xml); @@ -257,7 +267,7 @@ get_osdata (const char *type) } if (!osdata) - error (_("Can not fetch data now.\n")); + error (_("Can not fetch data now.")); return osdata; } @@ -281,68 +291,86 @@ get_osdata_column (struct osdata_item *item, const char *name) void info_osdata_command (char *type, int from_tty) { + struct ui_out *uiout = current_uiout; struct osdata *osdata = NULL; - struct osdata_item *last; + struct osdata_item *last = NULL; struct cleanup *old_chain; - int ncols; - int nprocs; - - if (type == 0) - /* TODO: No type could mean "list availables types". */ - error (_("Argument required.")); + int ncols = 0; + int nrows; osdata = get_osdata (type); old_chain = make_cleanup_osdata_free (osdata); - nprocs = VEC_length (osdata_item_s, osdata->items); + nrows = VEC_length (osdata_item_s, osdata->items); - last = VEC_last (osdata_item_s, osdata->items); - if (last && last->columns) - ncols = VEC_length (osdata_column_s, last->columns); - else - ncols = 0; + if (!type && nrows == 0) + error (_("Available types of OS data not reported.")); + + if (!VEC_empty (osdata_item_s, osdata->items)) + { + last = VEC_last (osdata_item_s, osdata->items); + if (last->columns) + ncols = VEC_length (osdata_column_s, last->columns); + } - make_cleanup_ui_out_table_begin_end (uiout, ncols, nprocs, + make_cleanup_ui_out_table_begin_end (uiout, ncols, nrows, "OSDataTable"); + /* With no columns/items, we just output an empty table, but we + still output the table. This matters for MI. */ + if (ncols == 0) + { + do_cleanups (old_chain); + return; + } + if (last && last->columns) { struct osdata_column *col; int ix; + for (ix = 0; VEC_iterate (osdata_column_s, last->columns, ix, col); ix++) - ui_out_table_header (uiout, 10, ui_left, - col->name, col->name); + { + char col_name[32]; + + snprintf (col_name, 32, "col%d", ix); + ui_out_table_header (uiout, 10, ui_left, + col_name, col->name); + } } ui_out_table_body (uiout); - if (nprocs != 0) + if (nrows != 0) { struct osdata_item *item; int ix_items; + for (ix_items = 0; VEC_iterate (osdata_item_s, osdata->items, ix_items, item); ix_items++) { struct cleanup *old_chain; - struct ui_stream *stb; int ix_cols; struct osdata_column *col; - stb = ui_out_stream_new (uiout); - old_chain = make_cleanup_ui_out_stream_delete (stb); - make_cleanup_ui_out_tuple_begin_end (uiout, "item"); + old_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "item"); for (ix_cols = 0; VEC_iterate (osdata_column_s, item->columns, ix_cols, col); ix_cols++) - ui_out_field_string (uiout, col->name, col->value); - + { + char col_name[32]; + + snprintf (col_name, 32, "col%d", ix_cols); + ui_out_field_string (uiout, col_name, col->value); + } + do_cleanups (old_chain); ui_out_text (uiout, "\n");