diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/doc/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/doc/gdb.texinfo | 47 | ||||
| -rw-r--r-- | gdb/inferior.c | 16 |
4 files changed, 59 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e122110..14db800 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2009-08-25 Pedro Alves <pedro@codesourcery.com> + + * inferior.c (print_inferior): Align columns left. Remove header + for the the "current" column. Rename column "Id" to "Num". + Rename column "PID" to "Description". Print if there's no selected + inferior. + 2009-08-25 Jan Kratochvil <jan.kratochvil@redhat.com> Fix ia64 start crash when GDB built with -lmcheck. diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 865967e..01f2872 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,9 @@ +2009-08-25 Pedro Alves <pedro@codesourcery.com> + + * gdb.texinfo (Debugging Multiple Inferiors): Add "info inferiors" + small example, and describe its columns. Replace "inferior-id" by + "infno" throughout. + 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * gdbint.texinfo (Releasing GDB): Point to diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index e5fe6ac..df88db7 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -2375,17 +2375,40 @@ To find out what inferiors exist at any moment, use @code{info inferiors}: @kindex info inferiors @item info inferiors Print a list of all inferiors currently being managed by @value{GDBN}. + +@value{GDBN} displays for each inferior (in this order): + +@enumerate +@item +the inferior number assigned by @value{GDBN} + +@item +the target system's inferior identifier +@end enumerate + +@noindent +An asterisk @samp{*} preceding the @value{GDBN} inferior number +indicates the current inferior. + +For example, @end table +@c end table here to get a little more width for example + +@smallexample +(@value{GDBP}) info inferiors + Num Description +* 1 process 2307 + 2 process 3401 +@end smallexample To switch focus between inferiors, use the @code{inferior} command: @table @code -@kindex inferior @var{inferior-id} -@item inferior @var{inferior-id} -Make inferior number @var{inferior-id} the current inferior. The -argument @var{inferior-id} is the internal inferior number assigned by -@value{GDBN}, as shown in the first field of the @samp{info inferiors} -display. +@kindex inferior @var{infno} +@item inferior @var{infno} +Make inferior number @var{infno} the current inferior. The argument +@var{infno} is the inferior number assigned by @value{GDBN}, as shown +in the first field of the @samp{info inferiors} display. @end table To quit debugging one of the inferiors, you can either detach from it @@ -2393,15 +2416,15 @@ by using the @w{@code{detach inferior}} command (allowing it to run independently), or kill it using the @w{@code{kill inferior}} command: @table @code -@kindex detach inferior @var{inferior-id} -@item detach inferior @var{inferior-id} +@kindex detach inferior @var{infno} +@item detach inferior @var{infno} Detach from the inferior identified by @value{GDBN} inferior number -@var{inferior-id}, and remove it from the inferior list. +@var{infno}, and remove it from the inferior list. -@kindex kill inferior @var{inferior-id} -@item kill inferior @var{inferior-id} +@kindex kill inferior @var{infno} +@item kill inferior @var{infno} Kill the inferior identified by @value{GDBN} inferior number -@var{inferior-id}, and remove it from the inferior list. +@var{infno}, and remove it from the inferior list. @end table To be notified when inferiors are started or exit under @value{GDBN}'s diff --git a/gdb/inferior.c b/gdb/inferior.c index 43eacda..676fff9 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -324,9 +324,9 @@ print_inferior (struct ui_out *uiout, int requested_inferior) 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_header (uiout, 1, ui_left, "current", ""); + ui_out_table_header (uiout, 4, ui_left, "number", "Num"); + ui_out_table_header (uiout, 17, ui_left, "target-id", "Description"); ui_out_table_body (uiout); for (inf = inferior_list; inf; inf = inf->next) @@ -343,13 +343,19 @@ print_inferior (struct ui_out *uiout, int requested_inferior) else ui_out_field_skip (uiout, "current"); - ui_out_field_int (uiout, "id", inf->num); - ui_out_field_int (uiout, "target-id", inf->pid); + ui_out_field_int (uiout, "number", inf->num); + ui_out_field_string (uiout, "target-id", + target_pid_to_str (pid_to_ptid (inf->pid))); ui_out_text (uiout, "\n"); do_cleanups (chain2); } + if (inferior_list + && ptid_equal (inferior_ptid, null_ptid)) + ui_out_message (uiout, 0, "\n\ +No selected inferior/thread. See `help thread' or `help inferior'.\n"); + do_cleanups (old_chain); } |