OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use ui_out_emit_tuple in tracepoint.c 

This changes some code in tracepoint.c to use ui_out_emit_tuple.  One
of these involved removing an otherwise unrelated cleanup (changing
type to std::string) and the other involved introducing a new block.

ChangeLog
2017-04-22  Tom Tromey  <tom@tromey.com>

	* tracepoint.c (tvariables_info_1)
	(print_one_static_tracepoint_marker): Use ui_out_emit_tuple.
This commit is contained in:
Tom Tromey 2017-04-12 16:15:14 -06:00
parent 46b9c12945
commit a14a62ddff
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2017-04-22 Tom Tromey <tom@tromey.com>
* tracepoint.c (tvariables_info_1)
(print_one_static_tracepoint_marker): Use ui_out_emit_tuple.
2017-04-22 Tom Tromey <tom@tromey.com>
* stack.c (print_frame_arg): Use ui_out_emit_tuple,

42
gdb/tracepoint.c
View File

@ -506,15 +506,12 @@ tvariables_info_1 (void)
for (ix = 0; VEC_iterate (tsv_s, tvariables, ix, tsv); ++ix)
{
struct cleanup *back_to2;
const char *c;
char *name;
back_to2 = make_cleanup_ui_out_tuple_begin_end (uiout, "variable");
ui_out_emit_tuple tuple_emitter (uiout, "variable");
name = concat ("$", tsv->name, (char *) NULL);
make_cleanup (xfree, name);
uiout->field_string ("name", name);
std::string name = std::string ("$") + tsv->name;
uiout->field_string ("name", name.c_str ());
uiout->field_string ("initial", plongest (tsv->initial_value));
if (tsv->value_known)
@ -533,8 +530,6 @@ tvariables_info_1 (void)
if (c)
uiout->field_string ("current", c);
uiout->text ("\n");
do_cleanups (back_to2);
}
do_cleanups (back_to);
@ -3841,7 +3836,6 @@ print_one_static_tracepoint_marker (int count,
char wrap_indent[80];
char extra_field_indent[80];
struct ui_out *uiout = current_uiout;
struct cleanup *bkpt_chain;
VEC(breakpoint_p) *tracepoints;
struct symtab_and_line sal;
@ -3852,7 +3846,7 @@ print_one_static_tracepoint_marker (int count,
tracepoints = static_tracepoints_here (marker->address);
bkpt_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "marker");
ui_out_emit_tuple tuple_emitter (uiout, "marker");
/* A counter field to help readability. This is not a stable
identifier! */
@ -3919,24 +3913,22 @@ print_one_static_tracepoint_marker (int count,
if (!VEC_empty (breakpoint_p, tracepoints))
{
struct cleanup *cleanup_chain;
int ix;
struct breakpoint *b;
cleanup_chain = make_cleanup_ui_out_tuple_begin_end (uiout,
"tracepoints-at");
{
ui_out_emit_tuple tuple_emitter (uiout, "tracepoints-at");
uiout->text (extra_field_indent);
uiout->text (_("Probed by static tracepoints: "));
for (ix = 0; VEC_iterate(breakpoint_p, tracepoints, ix, b); ix++)
{
if (ix > 0)
uiout->text (", ");
uiout->text ("#");
uiout->field_int ("tracepoint-id", b->number);
}
do_cleanups (cleanup_chain);
uiout->text (extra_field_indent);
uiout->text (_("Probed by static tracepoints: "));
for (ix = 0; VEC_iterate(breakpoint_p, tracepoints, ix, b); ix++)
{
if (ix > 0)
uiout->text (", ");
uiout->text ("#");
uiout->field_int ("tracepoint-id", b->number);
}
}
if (uiout->is_mi_like_p ())
uiout->field_int ("number-of-tracepoints",
@ -3945,8 +3937,6 @@ print_one_static_tracepoint_marker (int count,
uiout->text ("\n");
}
VEC_free (breakpoint_p, tracepoints);
do_cleanups (bkpt_chain);
}
static void