mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 03:54:41 +08:00
519d634396
Introduce new ui_file buffering_file to temporarily collect output written to gdb_std* output streams during print_thread, print_frame_info and print_stop_event. This ensures that output during these functions is not interrupted by debuginfod progress messages. With the addition of deferred debuginfo downloading it is possible for download progress messages to print during these events. Without any intervention we can end up with poorly formatted output: (gdb) backtrace [...] #8 0x00007fbe8af7d7cf in pygi_invoke_c_callable (Downloading separate debug info for /lib64/libpython3.11.so.1.0 function_cache=0x561221b224d0, state=<optimized out>... To fix this we buffer writes to gdb_std* output streams while allowing debuginfod progress messages to skip the buffers and print to the underlying output streams immediately. Buffered output is then written to the output streams. This ensures that progress messages print first, followed by uninterrupted frame/thread/stop info: (gdb) backtrace [...] Downloading separate debug info for /lib64/libpython3.11.so.1.0 #8 0x00007fbe8af7d7cf in pygi_invoke_c_callable (function_cache=0x561221b224d0, state=<optimized out>... Co-Authored-By: Andrew Burgess <aburgess@redhat.com> Approved-By: Andrew Burgess <aburgess@redhat.com>
157 lines
4.3 KiB
C++
157 lines
4.3 KiB
C++
/* Python implementation of ui_out
|
|
|
|
Copyright (C) 2023-2024 Free Software Foundation, Inc.
|
|
|
|
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/>. */
|
|
|
|
#ifndef GDB_PYTHON_PY_UIOUT_H
|
|
#define GDB_PYTHON_PY_UIOUT_H
|
|
|
|
#include "python-internal.h"
|
|
#include "ui-out.h"
|
|
|
|
/* A ui_out subclass that creates a Python object based on the data
|
|
that is passed in. */
|
|
|
|
class py_ui_out : public ui_out
|
|
{
|
|
public:
|
|
|
|
py_ui_out ()
|
|
: ui_out (fix_multi_location_breakpoint_output
|
|
| fix_breakpoint_script_output)
|
|
{
|
|
do_begin (ui_out_type_tuple, nullptr);
|
|
}
|
|
|
|
bool can_emit_style_escape () const override
|
|
{ return false; }
|
|
|
|
bool do_is_mi_like_p () const override
|
|
{ return true; }
|
|
|
|
/* Return the Python object that was created. If a Python error
|
|
occurred during the processing, set the Python error and return
|
|
nullptr. */
|
|
gdbpy_ref<> result ()
|
|
{
|
|
if (m_error.has_value ())
|
|
{
|
|
m_error->restore ();
|
|
return nullptr;
|
|
}
|
|
return std::move (current ().obj);
|
|
}
|
|
|
|
ui_file *current_stream () const override
|
|
{ return nullptr; }
|
|
|
|
protected:
|
|
|
|
void do_progress_end () override { }
|
|
void do_progress_start () override { }
|
|
void do_progress_notify (const std::string &, const char *, double, double)
|
|
override
|
|
{ }
|
|
|
|
void do_table_begin (int nbrofcols, int nr_rows, const char *tblid) override
|
|
{
|
|
do_begin (ui_out_type_list, tblid);
|
|
}
|
|
void do_table_body () override
|
|
{ }
|
|
void do_table_end () override
|
|
{
|
|
do_end (ui_out_type_list);
|
|
}
|
|
void do_table_header (int width, ui_align align,
|
|
const std::string &col_name,
|
|
const std::string &col_hdr) override
|
|
{ }
|
|
|
|
void do_begin (ui_out_type type, const char *id) override;
|
|
void do_end (ui_out_type type) override;
|
|
|
|
void do_field_signed (int fldno, int width, ui_align align,
|
|
const char *fldname, LONGEST value) override;
|
|
void do_field_unsigned (int fldno, int width, ui_align align,
|
|
const char *fldname, ULONGEST value) override;
|
|
|
|
void do_field_skip (int fldno, int width, ui_align align,
|
|
const char *fldname) override
|
|
{ }
|
|
|
|
void do_field_string (int fldno, int width, ui_align align,
|
|
const char *fldname, const char *string,
|
|
const ui_file_style &style) override;
|
|
void do_field_fmt (int fldno, int width, ui_align align,
|
|
const char *fldname, const ui_file_style &style,
|
|
const char *format, va_list args) override
|
|
ATTRIBUTE_PRINTF (7, 0);
|
|
|
|
void do_spaces (int numspaces) override
|
|
{ }
|
|
|
|
void do_text (const char *string) override
|
|
{ }
|
|
|
|
void do_message (const ui_file_style &style,
|
|
const char *format, va_list args)
|
|
override ATTRIBUTE_PRINTF (3,0)
|
|
{ }
|
|
|
|
void do_wrap_hint (int indent) override
|
|
{ }
|
|
|
|
void do_flush () override
|
|
{ }
|
|
|
|
void do_redirect (struct ui_file *outstream) override
|
|
{ }
|
|
|
|
private:
|
|
|
|
/* When constructing Python objects, this class keeps a stack of
|
|
objects being constructed. Each such object has this type. */
|
|
struct object_desc
|
|
{
|
|
/* Name of the field (or empty for lists) that this object will
|
|
eventually become. */
|
|
std::string field_name;
|
|
/* The object under construction. */
|
|
gdbpy_ref<> obj;
|
|
/* The type of structure being created. Note that tables are
|
|
treated as lists here. */
|
|
ui_out_type type;
|
|
};
|
|
|
|
/* The stack of objects being created. */
|
|
std::vector<object_desc> m_objects;
|
|
|
|
/* If an error occurred, this holds the exception information for
|
|
use by the 'release' method. */
|
|
std::optional<gdbpy_err_fetch> m_error;
|
|
|
|
/* Return a reference to the object under construction. */
|
|
object_desc ¤t ()
|
|
{ return m_objects.back (); }
|
|
|
|
/* Add a new field to the current object under construction. */
|
|
void add_field (const char *name, const gdbpy_ref<> &obj);
|
|
};
|
|
|
|
#endif /* GDB_PYTHON_PY_UIOUT_H */
|