Re: Move the multi-forks support to the generic multi-inferiors support.

Tom Tromey
2009-06-06T00:09:43Z

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Pedro> If you look at head's "info inferiors" output, it's not about cleaning
Pedro> up, it's about cooking something. :-)

Tom> Actually I hadn't looked at the code, I just tried it and saw that
Tom> there were still no column headings. I'll try to update that old
Tom> patch soon.

How about this? It adds the column headings and prints something when
there are no inferiors.

Built & regtested on x86-64 (compile farm).

Tom

2009-06-05 Tom Tromey <tromey@redhat.com>

* inferior.c (print_inferior): Make a table, not a list. Emit
table headers.

diff --git a/gdb/inferior.c b/gdb/inferior.c
index e060a1b..e74c7a4 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -294,8 +294,31 @@ print_inferior (struct ui_out *uiout, int requested_inferior)
{
struct inferior *inf;
struct cleanup *old_chain;
+ int inf_count = 0;

- old_chain = make_cleanup_ui_out_list_begin_end (uiout, "inferiors");
+ /* Compute number of inferiors we will print. */
+ for (inf = inferior_list; inf; inf = inf->next)
+ {
+ struct cleanup *chain2;
+
+ if (requested_inferior != -1 && inf->num != requested_inferior)
+ continue;
+
+ ++inf_count;
+ }
+
+ if (inf_count == 0)
+ {
+ ui_out_message (uiout, 0, "No inferiors.\n");
+ return;
+ }
+
+ old_chain = make_cleanup_ui_out_table_begin_end (uiout, 3, inf_count,
+ "inferiors");
+ ui_out_table_header (uiout, 3, ui_right, "current", "Cur");
+ ui_out_table_header (uiout, 4, ui_right, "id", "Id");
+ ui_out_table_header (uiout, 7, ui_right, "target-id", "PID");
+ ui_out_table_body (uiout);

for (inf = inferior_list; inf; inf = inf->next)
{
@@ -307,12 +330,11 @@ print_inferior (struct ui_out *uiout, int requested_inferior)
chain2 = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);

if (inf->pid == ptid_get_pid (inferior_ptid))
- ui_out_text (uiout, "* ");
+ ui_out_field_string (uiout, "current", "*");
else
- ui_out_text (uiout, " ");
+ ui_out_field_skip (uiout, "current");

ui_out_field_int (uiout, "id", inf->num);
- ui_out_text (uiout, " ");
ui_out_field_int (uiout, "target-id", inf->pid);

ui_out_text (uiout, "\n");