mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
17b2616cba
The other part of PR gdb/13860 is about console execution commands in MI getting their output half lost. E.g., take the finish command, executed on a frontend's GDB console: sync: finish &"finish\n" ~"Run till exit from #0 usleep (useconds=10) at ../sysdeps/unix/sysv/linux/usleep.c:27\n" ^running *running,thread-id="1" (gdb) ~"0x00000000004004d7 in foo () at stepinf.c:6\n" ~"6\t usleep (10);\n" ~"Value returned is $1 = 0\n" *stopped,reason="function-finished",frame={addr="0x00000000004004d7",func="foo",args=[],file="stepinf.c",fullname="/home/pedro/gdb/tests/stepinf.c",line="6"},thread-id="1",stopped-threads="all",core="1" async: finish &"finish\n" ~"Run till exit from #0 usleep (useconds=10) at ../sysdeps/unix/sysv/linux/usleep.c:27\n" ^running *running,thread-id="1" (gdb) *stopped,reason="function-finished",frame={addr="0x00000000004004d7",func="foo",args=[],file="stepinf.c",fullname="/home/pedro/gdb/tests/stepinf.c",line="6"},gdb-result-var="$1",return-value="0",thread-id="1",stopped-threads="all",core="0" Note how all the "Value returned" etc. output is missing in async mode. The same happens with e.g., catchpoints: =breakpoint-modified,bkpt={number="1",type="catchpoint",disp="keep",enabled="y",what="22016",times="1"} ~"\nCatchpoint " ~"1 (forked process 22016), 0x0000003791cbd8a6 in __libc_fork () at ../nptl/sysdeps/unix/sysv/linux/fork.c:131\n" ~"131\t pid = ARCH_FORK ();\n" *stopped,reason="fork",disp="keep",bkptno="1",newpid="22016",frame={addr="0x0000003791cbd8a6",func="__libc_fork",args=[],file="../nptl/sysdeps/unix/sysv/linux/fork.c",fullname="/usr/src/debug/glibc-2.14-394-g8f3b1ff/nptl/sysdeps/unix/sysv/linux/fork.c",line="131"},thread-id="1",stopped-threads="all",core="0" where all those ~ lines are missing in async mode, or just the "step" current line indication: s &"s\n" ^running *running,thread-id="all" (gdb) ~"13\t foo ();\n" *stopped,frame={addr="0x00000000004004ef",func="main",args=[{name="argc",value="1"},{name="argv",value="0x7fffffffdd78"}],file="stepinf.c",fullname="/home/pedro/gdb/tests/stepinf.c",line="13"},thread-id="1",stopped-threads="all",core="3" (gdb) Or in the case of the PRs example, the "Stopped due to shared library event" note: start &"start\n" ~"Temporary breakpoint 1 at 0x400608: file ../../../src/gdb/testsuite/gdb.mi/solib-main.c, line 21.\n" =breakpoint-created,bkpt={number="1",type="breakpoint",disp="del",enabled="y",addr="0x0000000000400608",func="main",file="../../../src/gdb/testsuite/gdb.mi/solib-main.c",fullname="/home/pedro/gdb/mygit/src/gdb/testsuite/gdb.mi/solib-main.c",line="21",times="0",original-location="main"} ~"Starting program: /home/pedro/gdb/mygit/build/gdb/testsuite/gdb.mi/solib-main \n" =thread-group-started,id="i1",pid="21990" =thread-created,id="1",group-id="i1" ^running *running,thread-id="all" (gdb) =library-loaded,id="/lib64/ld-linux-x86-64.so.2",target-name="/lib64/ld-linux-x86-64.so.2",host-name="/lib64/ld-linux-x86-64.so.2",symbols-loaded="0",thread-group="i1" ~"Stopped due to shared library event (no libraries added or removed)\n" *stopped,reason="solib-event",thread-id="1",stopped-threads="all",core="3" (gdb) IMO, if you're typing execution commands in a frontend's console, you expect to see their output. Indeed it's what you get in sync mode. I think async mode should do the same. Deciding what to mirror to the console wrt to breakpoints and random stops gets messy real fast. E.g., say "s" trips on a breakpoint. We'd clearly want to mirror the event to the console in this case. But what about more complicated cases like "s&; thread n; s&", and one of those steps spawning a new thread, and that thread hitting a breakpoint? It's impossible in general to track whether the thread had any relation to the commands that had been executed. So I think we should just simplify and always mirror breakpoints and random events to the console. Notes: - mi->out is the same as gdb_stdout when MI is the current interpreter. I think that referring to that directly is cleaner. An earlier revision of this patch made the changes that are now done in mi_on_normal_stop directly in infrun.c:normal_stop, and so not having an obvious place to put the new uiout by then, and not wanting to abuse CLI's uiout, I made a temporary uiout when necessary. - Hopefuly the rest of the patch is more or less obvious given the comments added. Tested on x86_64 Fedora 20, no regressions. 2014-05-21 Pedro Alves <palves@redhat.com> PR gdb/13860 * gdbthread.h (struct thread_control_state): New field `command_interp'. * infrun.c (follow_fork): Copy the new thread control field to the child fork thread. (clear_proceed_status_thread): Clear the new thread control field. (proceed): Set the new thread control field. * interps.h (command_interp): Declare. * interps.c (command_interpreter): New global. (command_interp): New function. (interp_exec): Set `command_interpreter' while here. * cli-out.c (cli_uiout_dtor): New function. (cli_ui_out_impl): Install it. * mi/mi-interp.c: Include cli-out.h. (mi_cmd_interpreter_exec): Add comment. (restore_current_uiout_cleanup): New function. (ui_out_free_cleanup): New function. (mi_on_normal_stop): If finishing an execution command started by a CLI command, or any kind of breakpoint-like event triggered, print the stop event to the output (CLI) stream. * mi/mi-out.c (mi_ui_out_impl): Install NULL `dtor' handler. 2014-05-21 Pedro Alves <palves@redhat.com> PR gdb/13860 * gdb.mi/mi-cli.exp (line_callee4_next_step): New global. (top level): Test that output related to execution commands is sent to the console with CLI commands, but not with MI commands. Test that breakpoint events are always mirrored to the console. Also expect the new source line to be output after a "next" in async mode too. Make it a pass/fail test. * gdb.mi/mi-solib.exp: Test that the CLI solib event note is output. * lib/mi-support.exp (mi_gdb_expect_cli_output): New procedure.
421 lines
9.2 KiB
C
421 lines
9.2 KiB
C
/* Output generating routines for GDB CLI.
|
|
|
|
Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions.
|
|
Written by Fernando Nasser for Cygnus.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "ui-out.h"
|
|
#include "cli-out.h"
|
|
#include <string.h>
|
|
#include "gdb_assert.h"
|
|
#include "vec.h"
|
|
|
|
typedef struct cli_ui_out_data cli_out_data;
|
|
|
|
|
|
/* Prototypes for local functions */
|
|
|
|
static void cli_text (struct ui_out *uiout, const char *string);
|
|
|
|
static void field_separator (void);
|
|
|
|
static void out_field_fmt (struct ui_out *uiout, int fldno,
|
|
const char *fldname,
|
|
const char *format,...) ATTRIBUTE_PRINTF (4, 5);
|
|
|
|
/* The destructor. */
|
|
|
|
static void
|
|
cli_uiout_dtor (struct ui_out *ui_out)
|
|
{
|
|
cli_out_data *data = ui_out_data (ui_out);
|
|
|
|
VEC_free (ui_filep, data->streams);
|
|
xfree (data);
|
|
}
|
|
|
|
/* These are the CLI output functions */
|
|
|
|
/* Mark beginning of a table */
|
|
|
|
static void
|
|
cli_table_begin (struct ui_out *uiout, int nbrofcols,
|
|
int nr_rows,
|
|
const char *tblid)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (nr_rows == 0)
|
|
data->suppress_output = 1;
|
|
else
|
|
/* Only the table suppresses the output and, fortunately, a table
|
|
is not a recursive data structure. */
|
|
gdb_assert (data->suppress_output == 0);
|
|
}
|
|
|
|
/* Mark beginning of a table body */
|
|
|
|
static void
|
|
cli_table_body (struct ui_out *uiout)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
/* first, close the table header line */
|
|
cli_text (uiout, "\n");
|
|
}
|
|
|
|
/* Mark end of a table */
|
|
|
|
static void
|
|
cli_table_end (struct ui_out *uiout)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
data->suppress_output = 0;
|
|
}
|
|
|
|
/* Specify table header */
|
|
|
|
static void
|
|
cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
|
|
const char *col_name,
|
|
const char *colhdr)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
We may have been extended. */
|
|
uo_field_string (uiout, 0, width, alignment, 0, colhdr);
|
|
}
|
|
|
|
/* Mark beginning of a list */
|
|
|
|
static void
|
|
cli_begin (struct ui_out *uiout,
|
|
enum ui_out_type type,
|
|
int level,
|
|
const char *id)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
}
|
|
|
|
/* Mark end of a list */
|
|
|
|
static void
|
|
cli_end (struct ui_out *uiout,
|
|
enum ui_out_type type,
|
|
int level)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
}
|
|
|
|
/* output an int field */
|
|
|
|
static void
|
|
cli_field_int (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alignment,
|
|
const char *fldname, int value)
|
|
{
|
|
char buffer[20]; /* FIXME: how many chars long a %d can become? */
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
xsnprintf (buffer, sizeof (buffer), "%d", value);
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
We may have been extended. */
|
|
uo_field_string (uiout, fldno, width, alignment, fldname, buffer);
|
|
}
|
|
|
|
/* used to ommit a field */
|
|
|
|
static void
|
|
cli_field_skip (struct ui_out *uiout, int fldno, int width,
|
|
enum ui_align alignment,
|
|
const char *fldname)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
/* Always go through the function pointer (virtual function call).
|
|
We may have been extended. */
|
|
uo_field_string (uiout, fldno, width, alignment, fldname, "");
|
|
}
|
|
|
|
/* other specific cli_field_* end up here so alignment and field
|
|
separators are both handled by cli_field_string */
|
|
|
|
static void
|
|
cli_field_string (struct ui_out *uiout,
|
|
int fldno,
|
|
int width,
|
|
enum ui_align align,
|
|
const char *fldname,
|
|
const char *string)
|
|
{
|
|
int before = 0;
|
|
int after = 0;
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
if ((align != ui_noalign) && string)
|
|
{
|
|
before = width - strlen (string);
|
|
if (before <= 0)
|
|
before = 0;
|
|
else
|
|
{
|
|
if (align == ui_right)
|
|
after = 0;
|
|
else if (align == ui_left)
|
|
{
|
|
after = before;
|
|
before = 0;
|
|
}
|
|
else
|
|
/* ui_center */
|
|
{
|
|
after = before / 2;
|
|
before -= after;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (before)
|
|
ui_out_spaces (uiout, before);
|
|
if (string)
|
|
out_field_fmt (uiout, fldno, fldname, "%s", string);
|
|
if (after)
|
|
ui_out_spaces (uiout, after);
|
|
|
|
if (align != ui_noalign)
|
|
field_separator ();
|
|
}
|
|
|
|
/* This is the only field function that does not align. */
|
|
|
|
static void ATTRIBUTE_PRINTF (6, 0)
|
|
cli_field_fmt (struct ui_out *uiout, int fldno,
|
|
int width, enum ui_align align,
|
|
const char *fldname,
|
|
const char *format,
|
|
va_list args)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream;
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
stream = VEC_last (ui_filep, data->streams);
|
|
vfprintf_filtered (stream, format, args);
|
|
|
|
if (align != ui_noalign)
|
|
field_separator ();
|
|
}
|
|
|
|
static void
|
|
cli_spaces (struct ui_out *uiout, int numspaces)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream;
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
stream = VEC_last (ui_filep, data->streams);
|
|
print_spaces_filtered (numspaces, stream);
|
|
}
|
|
|
|
static void
|
|
cli_text (struct ui_out *uiout, const char *string)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream;
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
stream = VEC_last (ui_filep, data->streams);
|
|
fputs_filtered (string, stream);
|
|
}
|
|
|
|
static void ATTRIBUTE_PRINTF (3, 0)
|
|
cli_message (struct ui_out *uiout, int verbosity,
|
|
const char *format, va_list args)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
|
|
if (ui_out_get_verblvl (uiout) >= verbosity)
|
|
{
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
|
|
vfprintf_unfiltered (stream, format, args);
|
|
}
|
|
}
|
|
|
|
static void
|
|
cli_wrap_hint (struct ui_out *uiout, char *identstring)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (data->suppress_output)
|
|
return;
|
|
wrap_here (identstring);
|
|
}
|
|
|
|
static void
|
|
cli_flush (struct ui_out *uiout)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
|
|
gdb_flush (stream);
|
|
}
|
|
|
|
/* OUTSTREAM as non-NULL will push OUTSTREAM on the stack of output streams
|
|
and make it therefore active. OUTSTREAM as NULL will pop the last pushed
|
|
output stream; it is an internal error if it does not exist. */
|
|
|
|
static int
|
|
cli_redirect (struct ui_out *uiout, struct ui_file *outstream)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
|
|
if (outstream != NULL)
|
|
VEC_safe_push (ui_filep, data->streams, outstream);
|
|
else
|
|
VEC_pop (ui_filep, data->streams);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* local functions */
|
|
|
|
/* Like cli_field_fmt, but takes a variable number of args
|
|
and makes a va_list and does not insert a separator. */
|
|
|
|
/* VARARGS */
|
|
static void
|
|
out_field_fmt (struct ui_out *uiout, int fldno,
|
|
const char *fldname,
|
|
const char *format,...)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
va_list args;
|
|
|
|
va_start (args, format);
|
|
vfprintf_filtered (stream, format, args);
|
|
|
|
va_end (args);
|
|
}
|
|
|
|
/* Access to ui_out format private members. */
|
|
|
|
static void
|
|
field_separator (void)
|
|
{
|
|
cli_out_data *data = ui_out_data (current_uiout);
|
|
struct ui_file *stream = VEC_last (ui_filep, data->streams);
|
|
|
|
fputc_filtered (' ', stream);
|
|
}
|
|
|
|
/* This is the CLI ui-out implementation functions vector */
|
|
|
|
const struct ui_out_impl cli_ui_out_impl =
|
|
{
|
|
cli_table_begin,
|
|
cli_table_body,
|
|
cli_table_end,
|
|
cli_table_header,
|
|
cli_begin,
|
|
cli_end,
|
|
cli_field_int,
|
|
cli_field_skip,
|
|
cli_field_string,
|
|
cli_field_fmt,
|
|
cli_spaces,
|
|
cli_text,
|
|
cli_message,
|
|
cli_wrap_hint,
|
|
cli_flush,
|
|
cli_redirect,
|
|
cli_uiout_dtor,
|
|
0, /* Does not need MI hacks (i.e. needs CLI hacks). */
|
|
};
|
|
|
|
/* Constructor for a `cli_out_data' object. */
|
|
|
|
void
|
|
cli_out_data_ctor (cli_out_data *self, struct ui_file *stream)
|
|
{
|
|
gdb_assert (stream != NULL);
|
|
|
|
self->streams = NULL;
|
|
VEC_safe_push (ui_filep, self->streams, stream);
|
|
|
|
self->suppress_output = 0;
|
|
}
|
|
|
|
/* Initialize private members at startup. */
|
|
|
|
struct ui_out *
|
|
cli_out_new (struct ui_file *stream)
|
|
{
|
|
int flags = ui_source_list;
|
|
cli_out_data *data = XNEW (cli_out_data);
|
|
|
|
cli_out_data_ctor (data, stream);
|
|
return ui_out_new (&cli_ui_out_impl, data, flags);
|
|
}
|
|
|
|
struct ui_file *
|
|
cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream)
|
|
{
|
|
cli_out_data *data = ui_out_data (uiout);
|
|
struct ui_file *old;
|
|
|
|
old = VEC_pop (ui_filep, data->streams);
|
|
VEC_quick_push (ui_filep, data->streams, stream);
|
|
|
|
return old;
|
|
}
|