aboutsummaryrefslogtreecommitdiff
path: root/gdb/ui-file.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2017-02-02 11:11:47 +0000
committerPedro Alves <palves@redhat.com>2017-02-02 11:11:47 +0000
commitd7e747318f4d04af033f16325f9b6d74f67079ec (patch)
tree87e84dd065099084e81cf12baaedde698eed2d63 /gdb/ui-file.c
parent187808b04f61df1c38fda0921e2d9eeb53e332ee (diff)
downloadgdb-d7e747318f4d04af033f16325f9b6d74f67079ec.zip
gdb-d7e747318f4d04af033f16325f9b6d74f67079ec.tar.gz
gdb-d7e747318f4d04af033f16325f9b6d74f67079ec.tar.bz2
Eliminate make_cleanup_ui_file_delete / make ui_file a class hierarchy
This patch starts from the desire to eliminate make_cleanup_ui_file_delete, but then goes beyond. It makes ui_file & friends a real C++ class hierarchy, and switches temporary ui_file-like objects to stack-based allocation. - mem_fileopen -> string_file mem_fileopen is replaced with a new string_file class that is treated as a value class created on the stack. This alone eliminates most make_cleanup_ui_file_delete calls, and, simplifies code a whole lot (diffstat shows around 1k loc dropped.) string_file's internal buffer is a std::string, thus the "string" in the name. This simplifies the implementation much, compared to mem_fileopen, which managed growing its internal buffer manually. - ui_file_as_string, ui_file_strdup, ui_file_obsavestring all gone The new string_file class has a string() method that provides direct writable access to the internal std::string buffer. This replaced ui_file_as_string, which forced a copy of the same data the stream had inside. With direct access via a writable reference, we can instead move the string out of the string_stream, avoiding deep string copying. Related, ui_file_xstrdup calls are replaced with xstrdup'ping the stream's string, and ui_file_obsavestring is replaced by obstack_copy0. With all those out of the way, getting rid of the weird ui_file_put mechanism was possible. - New ui_file::printf, ui_file::puts, etc. methods These simplify / clarify client code. I considered splitting client-code changes, like these, e.g.: - stb = mem_fileopen (); - fprintf_unfiltered (stb, "%s%s%s", - _("The valid values are:\n"), - regdesc, - _("The default is \"std\".")); + string_file stb; + stb.printf ("%s%s%s", + _("The valid values are:\n"), + regdesc, + _("The default is \"std\".")); In two steps, with the first step leaving fprintf_unfiltered (etc.) calls in place, and only afterwards do a pass to change all those to call stb.printf etc.. I didn't do that split, because (when I tried), it turned out to be pointless make-work: the first pass would have to touch the fprintf_unfiltered line anyway, to replace "stb" with "&stb". - gdb_fopen replaced with stack-based objects This avoids the need for cleanups or unique_ptr's. I.e., this: struct ui_file *file = gdb_fopen (filename, "w"); if (filename == NULL) perror_with_name (filename); cleanups = make_cleanup_ui_file_delete (file); // use file. do_cleanups (cleanups); is replaced with this: stdio_file file; if (!file.open (filename, "w")) perror_with_name (filename); // use file. - odd contorsions in null_file_write / null_file_fputs around when to call to_fputs / to_write eliminated. - Global null_stream object A few places that were allocating a ui_file in order to print to "nowhere" are adjusted to instead refer to a new 'null_stream' global stream. - TUI's tui_sfileopen eliminated. TUI's ui_file much simplified The TUI's ui_file was serving a dual purpose. It supported being used as string buffer, and supported being backed by a stdio FILE. The string buffer part is gone, replaced by using of string_file. The 'FILE *' support is now much simplified, by making the TUI's ui_file inherit from stdio_file. gdb/ChangeLog: 2017-02-02 Pedro Alves <palves@redhat.com> * ada-lang.c (type_as_string): Use string_file. * ada-valprint.c (ada_print_floating): Use string_file. * ada-varobj.c (ada_varobj_scalar_image) (ada_varobj_get_value_image): Use string_file. * aix-thread.c (aix_thread_extra_thread_info): Use string_file. * arm-tdep.c (_initialize_arm_tdep): Use string_printf. * breakpoint.c (update_inserted_breakpoint_locations) (insert_breakpoint_locations, reattach_breakpoints) (print_breakpoint_location, print_one_detail_ranged_breakpoint) (print_it_watchpoint): Use string_file. (save_breakpoints): Use stdio_file. * c-exp.y (oper): Use string_file. * cli/cli-logging.c (set_logging_redirect): Use ui_file_up and tee_file. (pop_output_files): Use delete. (handle_redirections): Use stdio_file and tee_file. * cli/cli-setshow.c (do_show_command): Use string_file. * compile/compile-c-support.c (c_compute_program): Use string_file. * compile/compile-c-symbols.c (generate_vla_size): Take a 'string_file &' instead of a 'ui_file *'. (generate_c_for_for_one_variable): Take a 'string_file &' instead of a 'ui_file *'. Use string_file. (generate_c_for_variable_locations): Take a 'string_file &' instead of a 'ui_file *'. * compile/compile-internal.h (generate_c_for_for_one_variable): Take a 'string_file &' instead of a 'ui_file *'. * compile/compile-loc2c.c (push, pushf, unary, binary) (print_label, pushf_register_address, pushf_register) (do_compile_dwarf_expr_to_c): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * compile/compile.c (compile_to_object): Use string_file. * compile/compile.h (compile_dwarf_expr_to_c) (compile_dwarf_bounds_to_c): Take a 'string_file &' instead of a 'ui_file *'. * cp-support.c (inspect_type): Use string_file and obstack_copy0. (replace_typedefs_qualified_name): Use string_file and obstack_copy0. * disasm.c (gdb_pretty_print_insn): Use string_file. (gdb_disassembly): Adjust reference the null_stream global. (do_ui_file_delete): Delete. (gdb_insn_length): Use null_stream. * dummy-frame.c (maintenance_print_dummy_frames): Use stdio_file. * dwarf2loc.c (dwarf2_compile_property_to_c) (locexpr_generate_c_location, loclist_generate_c_location): Take a 'string_file &' instead of a 'ui_file *'. * dwarf2loc.h (dwarf2_compile_property_to_c): Likewise. * dwarf2read.c (do_ui_file_peek_last): Delete. (dwarf2_compute_name): Use string_file. * event-top.c (gdb_setup_readline): Use stdio_file. * gdbarch.sh (verify_gdbarch): Use string_file. * gdbtypes.c (safe_parse_type): Use null_stream. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Use string_file. * guile/scm-disasm.c (gdbscm_print_insn_from_port): Take a 'string_file *' instead of a 'ui_file *'. (gdbscm_arch_disassemble): Use string_file. * guile/scm-frame.c (frscm_print_frame_smob): Use string_file. * guile/scm-ports.c (class ioscm_file_port): Now a class that inherits from ui_file. (ioscm_file_port_delete, ioscm_file_port_rewind) (ioscm_file_port_put): Delete. (ioscm_file_port_write): Rename to ... (ioscm_file_port::write): ... this. Remove file_port_magic checks. (ioscm_file_port_new): Delete. (ioscm_with_output_to_port_worker): Use ioscm_file_port and ui_file_up. * guile/scm-type.c (tyscm_type_name): Use string_file. * guile/scm-value.c (vlscm_print_value_smob, gdbscm_value_print): Use string_file. * infcmd.c (print_return_value_1): Use string_file. * infrun.c (print_target_wait_results): Use string_file. * language.c (add_language): Use string_file. * location.c (explicit_to_string_internal): Use string_file. * main.c (captured_main_1): Use null_file. * maint.c (maintenance_print_architecture): Use stdio_file. * mi/mi-cmd-stack.c (list_arg_or_local): Use string_file. * mi/mi-common.h (struct mi_interp) <out, err, log, targ, event_channel>: Change type to mi_console_file pointer. * mi/mi-console.c (mi_console_file_fputs, mi_console_file_flush) (mi_console_file_delete): Delete. (struct mi_console_file): Delete. (mi_console_file_magic): Delete. (mi_console_file_new): Delete. (mi_console_file::mi_console_file): New. (mi_console_file_delete): Delete. (mi_console_file_fputs): Delete. (mi_console_file::write): New. (mi_console_raw_packet): Delete. (mi_console_file::flush): New. (mi_console_file_flush): Delete. (mi_console_set_raw): Rename to ... (mi_console_file::set_raw): ... this. * mi/mi-console.h (class mi_console_file): New class. (mi_console_file_new, mi_console_set_raw): Delete. * mi/mi-interp.c (mi_interpreter_init): Use mi_console_file. (mi_set_logging): Use delete and tee_file. Adjust. * mi/mi-main.c (output_register): Use string_file. (mi_cmd_data_evaluate_expression): Use string_file. (mi_cmd_data_read_memory): Use string_file. (mi_cmd_execute, print_variable_or_computed): Use string_file. * mi/mi-out.c (mi_ui_out::main_stream): New. (mi_ui_out::rewind): Use main_stream and string_file. (mi_ui_out::put): Use main_stream and string_file. (mi_ui_out::mi_ui_out): Remove 'stream' parameter. Allocate a 'string_file' instead. (mi_out_new): Don't allocate a mem_fileopen stream here. * mi/mi-out.h (mi_ui_out::mi_ui_out): Remove 'stream' parameter. (mi_ui_out::main_stream): Declare method. * printcmd.c (eval_command): Use string_file. * psymtab.c (maintenance_print_psymbols): Use stdio_file. * python/py-arch.c (archpy_disassemble): Use string_file. * python/py-breakpoint.c (bppy_get_commands): Use string_file. * python/py-frame.c (frapy_str): Use string_file. * python/py-framefilter.c (py_print_type, py_print_single_arg): Use string_file. * python/py-type.c (typy_str): Use string_file. * python/py-unwind.c (unwind_infopy_str): Use string_file. * python/py-value.c (valpy_str): Use string_file. * record-btrace.c (btrace_insn_history): Use string_file. * regcache.c (regcache_print): Use stdio_file. * reggroups.c (maintenance_print_reggroups): Use stdio_file. * remote.c (escape_buffer): Use string_file. * rust-lang.c (rust_get_disr_info): Use string_file. * serial.c (serial_open_ops_1): Use stdio_file. (do_serial_close): Use delete. * stack.c (print_frame_arg): Use string_file. (print_frame_args): Remove local mem_fileopen stream, not used. (print_frame): Use string_file. * symmisc.c (maintenance_print_symbols): Use stdio_file. * symtab.h (struct symbol_computed_ops) <generate_c_location>: Take a 'string_file *' instead of a 'ui_file *'. * top.c (new_ui): Use stdio_file and stderr_file. (free_ui): Use delete. (execute_command_to_string): Use string_file. (quit_confirm): Use string_file. * tracepoint.c (collection_list::append_exp): Use string_file. * tui/tui-disasm.c (tui_disassemble): Use string_file. * tui/tui-file.c: Don't include "ui-file.h". (enum streamtype, struct tui_stream): Delete. (tui_file_new, tui_file_delete, tui_fileopen, tui_sfileopen) (tui_file_isatty, tui_file_rewind, tui_file_put): Delete. (tui_file::tui_file): New method. (tui_file_fputs): Delete. (tui_file_get_strbuf): Delete. (tui_file::puts): New method. (tui_file_adjust_strbuf): Delete. (tui_file_flush): Delete. (tui_file::flush): New method. * tui/tui-file.h: Tweak intro comment. Include ui-file.h. (tui_fileopen, tui_sfileopen, tui_file_get_strbuf) (tui_file_adjust_strbuf): Delete declarations. (class tui_file): New class. * tui/tui-io.c (tui_initialize_io): Use tui_file. * tui/tui-regs.c (tui_restore_gdbout): Use delete. (tui_register_format): Use string_stream. * tui/tui-stack.c (tui_make_status_line): Use string_file. (tui_get_function_from_frame): Use string_file. * typeprint.c (type_to_string): Use string_file. * ui-file.c (struct ui_file, ui_file_magic, ui_file_new): Delete. (null_stream): New global. (ui_file_delete): Delete. (ui_file::ui_file): New. (null_file_isatty): Delete. (ui_file::~ui_file): New. (null_file_rewind): Delete. (ui_file::printf): New. (null_file_put): Delete. (null_file_flush): Delete. (ui_file::putstr): New. (null_file_write): Delete. (ui_file::putstrn): New. (null_file_read): Delete. (ui_file::putc): New. (null_file_fputs): Delete. (null_file_write_async_safe): Delete. (ui_file::vprintf): New. (null_file_delete): Delete. (null_file::write): New. (null_file_fseek): Delete. (null_file::puts): New. (ui_file_data): Delete. (null_file::write_async_safe): New. (gdb_flush, ui_file_isatty): Adjust. (ui_file_put, ui_file_rewind): Delete. (ui_file_write): Adjust. (ui_file_write_for_put): Delete. (ui_file_write_async_safe, ui_file_read): Adjust. (ui_file_fseek): Delete. (fputs_unfiltered): Adjust. (set_ui_file_flush, set_ui_file_isatty, set_ui_file_rewind) (set_ui_file_put, set_ui_file_write, set_ui_file_write_async_safe) (set_ui_file_read, set_ui_file_fputs, set_ui_file_fseek) (set_ui_file_data): Delete. (string_file::~string_file, string_file::write) (struct accumulated_ui_file, do_ui_file_xstrdup, ui_file_xstrdup) (do_ui_file_as_string, ui_file_as_string): Delete. (do_ui_file_obsavestring, ui_file_obsavestring): Delete. (struct mem_file): Delete. (mem_file_new): Delete. (stdio_file::stdio_file): New. (mem_file_delete): Delete. (stdio_file::stdio_file): New. (mem_fileopen): Delete. (stdio_file::~stdio_file): New. (mem_file_rewind): Delete. (stdio_file::set_stream): New. (mem_file_put): Delete. (stdio_file::open): New. (mem_file_write): Delete. (stdio_file_magic, struct stdio_file): Delete. (stdio_file_new, stdio_file_delete, stdio_file_flush): Delete. (stdio_file::flush): New. (stdio_file_read): Rename to ... (stdio_file::read): ... this. Adjust. (stdio_file_write): Rename to ... (stdio_file::write): ... this. Adjust. (stdio_file_write_async_safe): Rename to ... (stdio_file::write_async_safe) ... this. Adjust. (stdio_file_fputs): Rename to ... (stdio_file::puts) ... this. Adjust. (stdio_file_isatty): Delete. (stdio_file_fseek): Delete. (stdio_file::isatty): New. (stderr_file_write): Rename to ... (stderr_file::write) ... this. Adjust. (stderr_file_fputs): Rename to ... (stderr_file::puts) ... this. Adjust. (stderr_fileopen, stdio_fileopen, gdb_fopen): Delete. (stderr_file::stderr_file): New. (tee_file_magic): Delete. (struct tee_file): Delete. (tee_file::tee_file): New. (tee_file_new): Delete. (tee_file::~tee_file): New. (tee_file_delete): Delete. (tee_file_flush): Rename to ... (tee_file::flush): ... this. Adjust. (tee_file_write): Rename to ... (tee_file::write): ... this. Adjust. (tee_file::write_async_safe): New. (tee_file_fputs): Rename to ... (tee_file::puts): ... this. Adjust. (tee_file_isatty): Rename to ... (tee_file::isatty): ... this. Adjust. * ui-file.h (struct obstack, struct ui_file): Don't forward-declare. (ui_file_new, ui_file_flush_ftype, set_ui_file_flush) (ui_file_write_ftype) (set_ui_file_write, ui_file_fputs_ftype, set_ui_file_fputs) (ui_file_write_async_safe_ftype, set_ui_file_write_async_safe) (ui_file_read_ftype, set_ui_file_read, ui_file_isatty_ftype) (set_ui_file_isatty, ui_file_rewind_ftype, set_ui_file_rewind) (ui_file_put_method_ftype, ui_file_put_ftype, set_ui_file_put) (ui_file_delete_ftype, set_ui_file_data, ui_file_fseek_ftype) (set_ui_file_fseek): Delete. (ui_file_data, ui_file_delete, ui_file_rewind) (struct ui_file): New. (ui_file_up): New. (class null_file): New. (null_stream): Declare. (ui_file_write_for_put, ui_file_put): Delete. (ui_file_xstrdup, ui_file_as_string, ui_file_obsavestring): Delete. (ui_file_fseek, mem_fileopen, stdio_fileopen, stderr_fileopen) (gdb_fopen, tee_file_new): Delete. (struct string_file): New. (struct stdio_file): New. (stdio_file_up): New. (struct stderr_file): New. (class tee_file): New. * ui-out.c (ui_out::field_stream): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * ui-out.h (class ui_out) <field_stream>: Likewise. * utils.c (do_ui_file_delete, make_cleanup_ui_file_delete) (null_stream): Delete. (error_stream): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * utils.h (struct ui_file): Delete forward declaration.. (make_cleanup_ui_file_delete, null_stream): Delete declarations. (error_stream): Take a 'string_file &' instead of a 'ui_file *'. * varobj.c (varobj_value_get_print_value): Use string_file. * xtensa-tdep.c (xtensa_verify_config): Use string_file. * gdbarch.c: Regenerate.
Diffstat (limited to 'gdb/ui-file.c')
-rw-r--r--gdb/ui-file.c802
1 files changed, 138 insertions, 664 deletions
diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index 3dce511..60e3274 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -25,193 +25,80 @@
#include "gdb_select.h"
#include "filestuff.h"
-static ui_file_isatty_ftype null_file_isatty;
-static ui_file_write_ftype null_file_write;
-static ui_file_write_ftype null_file_write_async_safe;
-static ui_file_fputs_ftype null_file_fputs;
-static ui_file_read_ftype null_file_read;
-static ui_file_flush_ftype null_file_flush;
-static ui_file_delete_ftype null_file_delete;
-static ui_file_rewind_ftype null_file_rewind;
-static ui_file_put_ftype null_file_put;
-static ui_file_fseek_ftype null_file_fseek;
-
-struct ui_file
- {
- int *magic;
- ui_file_flush_ftype *to_flush;
- ui_file_write_ftype *to_write;
- ui_file_write_async_safe_ftype *to_write_async_safe;
- ui_file_fputs_ftype *to_fputs;
- ui_file_read_ftype *to_read;
- ui_file_delete_ftype *to_delete;
- ui_file_isatty_ftype *to_isatty;
- ui_file_rewind_ftype *to_rewind;
- ui_file_put_ftype *to_put;
- ui_file_fseek_ftype *to_fseek;
- void *to_data;
- };
-int ui_file_magic;
-
-struct ui_file *
-ui_file_new (void)
-{
- struct ui_file *file = XNEW (struct ui_file);
-
- file->magic = &ui_file_magic;
- set_ui_file_data (file, NULL, null_file_delete);
- set_ui_file_flush (file, null_file_flush);
- set_ui_file_write (file, null_file_write);
- set_ui_file_write_async_safe (file, null_file_write_async_safe);
- set_ui_file_fputs (file, null_file_fputs);
- set_ui_file_read (file, null_file_read);
- set_ui_file_isatty (file, null_file_isatty);
- set_ui_file_rewind (file, null_file_rewind);
- set_ui_file_put (file, null_file_put);
- set_ui_file_fseek (file, null_file_fseek);
- return file;
-}
+null_file null_stream;
-void
-ui_file_delete (struct ui_file *file)
-{
- file->to_delete (file);
- xfree (file);
-}
+ui_file::ui_file ()
+{}
-static int
-null_file_isatty (struct ui_file *file)
-{
- return 0;
-}
+ui_file::~ui_file ()
+{}
-static void
-null_file_rewind (struct ui_file *file)
+void
+ui_file::printf (const char *format, ...)
{
- return;
-}
+ va_list args;
-static void
-null_file_put (struct ui_file *file,
- ui_file_put_method_ftype *write,
- void *dest)
-{
- return;
+ va_start (args, format);
+ vfprintf_unfiltered (this, format, args);
+ va_end (args);
}
-static void
-null_file_flush (struct ui_file *file)
+void
+ui_file::putstr (const char *str, int quoter)
{
- return;
+ fputstr_unfiltered (str, quoter, this);
}
-static void
-null_file_write (struct ui_file *file,
- const char *buf,
- long sizeof_buf)
+void
+ui_file::putstrn (const char *str, int n, int quoter)
{
- if (file->to_fputs == null_file_fputs)
- /* Both the write and fputs methods are null. Discard the
- request. */
- return;
- else
- {
- /* The fputs method isn't null, slowly pass the write request
- onto that. FYI, this isn't as bad as it may look - the
- current (as of 1999-11-07) printf_* function calls fputc and
- fputc does exactly the below. By having a write function it
- is possible to clean up that code. */
- int i;
- char b[2];
-
- b[1] = '\0';
- for (i = 0; i < sizeof_buf; i++)
- {
- b[0] = buf[i];
- file->to_fputs (b, file);
- }
- return;
- }
+ fputstrn_unfiltered (str, n, quoter, this);
}
-static long
-null_file_read (struct ui_file *file,
- char *buf,
- long sizeof_buf)
+int
+ui_file::putc (int c)
{
- errno = EBADF;
- return 0;
+ return fputc_unfiltered (c, this);
}
-static void
-null_file_fputs (const char *buf, struct ui_file *file)
+void
+ui_file::vprintf (const char *format, va_list args)
{
- if (file->to_write == null_file_write)
- /* Both the write and fputs methods are null. Discard the
- request. */
- return;
- else
- {
- /* The write method was implemented, use that. */
- file->to_write (file, buf, strlen (buf));
- }
+ vfprintf_unfiltered (this, format, args);
}
-static void
-null_file_write_async_safe (struct ui_file *file,
- const char *buf,
- long sizeof_buf)
-{
- return;
-}
+
-static void
-null_file_delete (struct ui_file *file)
+void
+null_file::write (const char *buf, long sizeof_buf)
{
- return;
+ /* Discard the request. */
}
-static int
-null_file_fseek (struct ui_file *stream, long offset, int whence)
+void
+null_file::puts (const char *)
{
- errno = EBADF;
-
- return -1;
+ /* Discard the request. */
}
-void *
-ui_file_data (struct ui_file *file)
+void
+null_file::write_async_safe (const char *buf, long sizeof_buf)
{
- if (file->magic != &ui_file_magic)
- internal_error (__FILE__, __LINE__,
- _("ui_file_data: bad magic number"));
- return file->to_data;
+ /* Discard the request. */
}
+
+
void
gdb_flush (struct ui_file *file)
{
- file->to_flush (file);
+ file->flush ();
}
int
ui_file_isatty (struct ui_file *file)
{
- return file->to_isatty (file);
-}
-
-void
-ui_file_rewind (struct ui_file *file)
-{
- file->to_rewind (file);
-}
-
-void
-ui_file_put (struct ui_file *file,
- ui_file_put_method_ftype *write,
- void *dest)
-{
- file->to_put (file, write, dest);
+ return file->isatty ();
}
void
@@ -219,13 +106,7 @@ ui_file_write (struct ui_file *file,
const char *buf,
long length_buf)
{
- file->to_write (file, buf, length_buf);
-}
-
-void
-ui_file_write_for_put (void *data, const char *buffer, long length_buffer)
-{
- ui_file_write ((struct ui_file *) data, buffer, length_buffer);
+ file->write (buf, length_buf);
}
void
@@ -233,622 +114,215 @@ ui_file_write_async_safe (struct ui_file *file,
const char *buf,
long length_buf)
{
- file->to_write_async_safe (file, buf, length_buf);
+ file->write_async_safe (buf, length_buf);
}
long
ui_file_read (struct ui_file *file, char *buf, long length_buf)
{
- return file->to_read (file, buf, length_buf);
-}
-
-int
-ui_file_fseek (struct ui_file *file, long offset, int whence)
-{
- return file->to_fseek (file, offset, whence);
+ return file->read (buf, length_buf);
}
void
fputs_unfiltered (const char *buf, struct ui_file *file)
{
- file->to_fputs (buf, file);
+ file->puts (buf);
}
-void
-set_ui_file_flush (struct ui_file *file, ui_file_flush_ftype *flush_ptr)
-{
- file->to_flush = flush_ptr;
-}
-
-void
-set_ui_file_isatty (struct ui_file *file, ui_file_isatty_ftype *isatty_ptr)
-{
- file->to_isatty = isatty_ptr;
-}
-
-void
-set_ui_file_rewind (struct ui_file *file, ui_file_rewind_ftype *rewind_ptr)
-{
- file->to_rewind = rewind_ptr;
-}
+
-void
-set_ui_file_put (struct ui_file *file, ui_file_put_ftype *put_ptr)
-{
- file->to_put = put_ptr;
-}
+string_file::~string_file ()
+{}
void
-set_ui_file_write (struct ui_file *file,
- ui_file_write_ftype *write_ptr)
+string_file::write (const char *buf, long length_buf)
{
- file->to_write = write_ptr;
+ m_string.append (buf, length_buf);
}
-void
-set_ui_file_write_async_safe (struct ui_file *file,
- ui_file_write_async_safe_ftype *write_async_safe_ptr)
-{
- file->to_write_async_safe = write_async_safe_ptr;
-}
+
-void
-set_ui_file_read (struct ui_file *file, ui_file_read_ftype *read_ptr)
+stdio_file::stdio_file (FILE *file, bool close_p)
{
- file->to_read = read_ptr;
+ set_stream (file);
+ m_close_p = close_p;
}
-void
-set_ui_file_fputs (struct ui_file *file, ui_file_fputs_ftype *fputs_ptr)
-{
- file->to_fputs = fputs_ptr;
-}
+stdio_file::stdio_file ()
+ : m_file (NULL),
+ m_fd (-1),
+ m_close_p (false)
+{}
-void
-set_ui_file_fseek (struct ui_file *file, ui_file_fseek_ftype *fseek_ptr)
+stdio_file::~stdio_file ()
{
- file->to_fseek = fseek_ptr;
+ if (m_close_p)
+ fclose (m_file);
}
void
-set_ui_file_data (struct ui_file *file, void *data,
- ui_file_delete_ftype *delete_ptr)
+stdio_file::set_stream (FILE *file)
{
- file->to_data = data;
- file->to_delete = delete_ptr;
+ m_file = file;
+ m_fd = fileno (file);
}
-/* ui_file utility function for converting a ``struct ui_file'' into
- a memory buffer. */
-
-struct accumulated_ui_file
+bool
+stdio_file::open (const char *name, const char *mode)
{
- char *buffer;
- long length;
-};
-
-static void
-do_ui_file_xstrdup (void *context, const char *buffer, long length)
-{
- struct accumulated_ui_file *acc = (struct accumulated_ui_file *) context;
-
- if (acc->buffer == NULL)
- acc->buffer = (char *) xmalloc (length + 1);
- else
- acc->buffer = (char *) xrealloc (acc->buffer, acc->length + length + 1);
- memcpy (acc->buffer + acc->length, buffer, length);
- acc->length += length;
- acc->buffer[acc->length] = '\0';
-}
-
-char *
-ui_file_xstrdup (struct ui_file *file, long *length)
-{
- struct accumulated_ui_file acc;
-
- acc.buffer = NULL;
- acc.length = 0;
- ui_file_put (file, do_ui_file_xstrdup, &acc);
- if (acc.buffer == NULL)
- acc.buffer = xstrdup ("");
- if (length != NULL)
- *length = acc.length;
- return acc.buffer;
-}
-
-/* ui_file utility function for converting a ``struct ui_file'' into a
- std:string. */
-
-static void
-do_ui_file_as_string (void *context, const char *buffer, long length)
-{
- std::string *str = (std::string *) context;
-
- *str = std::string (buffer, length);
-}
-
-/* See ui-file.h. */
-
-std::string
-ui_file_as_string (struct ui_file *file)
-{
- std::string str;
-
- ui_file_put (file, do_ui_file_as_string, &str);
- return str;
-}
-
-static void
-do_ui_file_obsavestring (void *context, const char *buffer, long length)
-{
- struct obstack *obstack = (struct obstack *) context;
-
- obstack_grow (obstack, buffer, length);
-}
-
-char *
-ui_file_obsavestring (struct ui_file *file, struct obstack *obstack,
- long *length)
-{
- ui_file_put (file, do_ui_file_obsavestring, obstack);
- *length = obstack_object_size (obstack);
- obstack_1grow (obstack, '\0');
- return (char *) obstack_finish (obstack);
-}
-
-/* A pure memory based ``struct ui_file'' that can be used an output
- buffer. The buffers accumulated contents are available via
- ui_file_put(). */
-
-struct mem_file
- {
- int *magic;
- char *buffer;
- int sizeof_buffer;
- int length_buffer;
- };
-
-static ui_file_rewind_ftype mem_file_rewind;
-static ui_file_put_ftype mem_file_put;
-static ui_file_write_ftype mem_file_write;
-static ui_file_delete_ftype mem_file_delete;
-static struct ui_file *mem_file_new (void);
-static int mem_file_magic;
-
-static struct ui_file *
-mem_file_new (void)
-{
- struct mem_file *stream = XNEW (struct mem_file);
- struct ui_file *file = ui_file_new ();
-
- set_ui_file_data (file, stream, mem_file_delete);
- set_ui_file_rewind (file, mem_file_rewind);
- set_ui_file_put (file, mem_file_put);
- set_ui_file_write (file, mem_file_write);
- stream->magic = &mem_file_magic;
- stream->buffer = NULL;
- stream->sizeof_buffer = 0;
- stream->length_buffer = 0;
- return file;
-}
-
-static void
-mem_file_delete (struct ui_file *file)
-{
- struct mem_file *stream = (struct mem_file *) ui_file_data (file);
+ /* Close the previous stream, if we own it. */
+ if (m_close_p)
+ {
+ fclose (m_file);
+ m_close_p = false;
+ }
- if (stream->magic != &mem_file_magic)
- internal_error (__FILE__, __LINE__,
- _("mem_file_delete: bad magic number"));
- if (stream->buffer != NULL)
- xfree (stream->buffer);
- xfree (stream);
-}
+ FILE *f = gdb_fopen_cloexec (name, mode);
-struct ui_file *
-mem_fileopen (void)
-{
- return mem_file_new ();
-}
+ if (f == NULL)
+ return false;
-static void
-mem_file_rewind (struct ui_file *file)
-{
- struct mem_file *stream = (struct mem_file *) ui_file_data (file);
+ set_stream (f);
+ m_close_p = true;
- if (stream->magic != &mem_file_magic)
- internal_error (__FILE__, __LINE__,
- _("mem_file_rewind: bad magic number"));
- stream->length_buffer = 0;
-}
-
-static void
-mem_file_put (struct ui_file *file,
- ui_file_put_method_ftype *write,
- void *dest)
-{
- struct mem_file *stream = (struct mem_file *) ui_file_data (file);
-
- if (stream->magic != &mem_file_magic)
- internal_error (__FILE__, __LINE__,
- _("mem_file_put: bad magic number"));
- if (stream->length_buffer > 0)
- write (dest, stream->buffer, stream->length_buffer);
+ return true;
}
void
-mem_file_write (struct ui_file *file,
- const char *buffer,
- long length_buffer)
-{
- struct mem_file *stream = (struct mem_file *) ui_file_data (file);
-
- if (stream->magic != &mem_file_magic)
- internal_error (__FILE__, __LINE__,
- _("mem_file_write: bad magic number"));
- if (stream->buffer == NULL)
- {
- stream->length_buffer = length_buffer;
- stream->sizeof_buffer = length_buffer;
- stream->buffer = (char *) xmalloc (stream->sizeof_buffer);
- memcpy (stream->buffer, buffer, length_buffer);
- }
- else
- {
- int new_length = stream->length_buffer + length_buffer;
-
- if (new_length >= stream->sizeof_buffer)
- {
- stream->sizeof_buffer = new_length;
- stream->buffer
- = (char *) xrealloc (stream->buffer, stream->sizeof_buffer);
- }
- memcpy (stream->buffer + stream->length_buffer, buffer, length_buffer);
- stream->length_buffer = new_length;
- }
-}
-
-/* ``struct ui_file'' implementation that maps directly onto
- <stdio.h>'s FILE. */
-
-static ui_file_write_ftype stdio_file_write;
-static ui_file_write_async_safe_ftype stdio_file_write_async_safe;
-static ui_file_fputs_ftype stdio_file_fputs;
-static ui_file_read_ftype stdio_file_read;
-static ui_file_isatty_ftype stdio_file_isatty;
-static ui_file_delete_ftype stdio_file_delete;
-static struct ui_file *stdio_file_new (FILE *file, int close_p);
-static ui_file_flush_ftype stdio_file_flush;
-static ui_file_fseek_ftype stdio_file_fseek;
-
-static int stdio_file_magic;
-
-struct stdio_file
- {
- int *magic;
- FILE *file;
- /* The associated file descriptor is extracted ahead of time for
- stdio_file_write_async_safe's benefit, in case fileno isn't async-safe. */
- int fd;
- int close_p;
- };
-
-static struct ui_file *
-stdio_file_new (FILE *file, int close_p)
-{
- struct ui_file *ui_file = ui_file_new ();
- struct stdio_file *stdio = XNEW (struct stdio_file);
-
- stdio->magic = &stdio_file_magic;
- stdio->file = file;
- stdio->fd = fileno (file);
- stdio->close_p = close_p;
- set_ui_file_data (ui_file, stdio, stdio_file_delete);
- set_ui_file_flush (ui_file, stdio_file_flush);
- set_ui_file_write (ui_file, stdio_file_write);
- set_ui_file_write_async_safe (ui_file, stdio_file_write_async_safe);
- set_ui_file_fputs (ui_file, stdio_file_fputs);
- set_ui_file_read (ui_file, stdio_file_read);
- set_ui_file_isatty (ui_file, stdio_file_isatty);
- set_ui_file_fseek (ui_file, stdio_file_fseek);
- return ui_file;
-}
-
-static void
-stdio_file_delete (struct ui_file *file)
-{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_delete: bad magic number"));
- if (stdio->close_p)
- {
- fclose (stdio->file);
- }
- xfree (stdio);
-}
-
-static void
-stdio_file_flush (struct ui_file *file)
+stdio_file::flush ()
{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_flush: bad magic number"));
- fflush (stdio->file);
+ fflush (m_file);
}
-static long
-stdio_file_read (struct ui_file *file, char *buf, long length_buf)
+long
+stdio_file::read (char *buf, long length_buf)
{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_read: bad magic number"));
-
/* Wait until at least one byte of data is available, or we get
interrupted with Control-C. */
{
fd_set readfds;
FD_ZERO (&readfds);
- FD_SET (stdio->fd, &readfds);
- if (interruptible_select (stdio->fd + 1, &readfds, NULL, NULL, NULL) == -1)
+ FD_SET (m_fd, &readfds);
+ if (interruptible_select (m_fd + 1, &readfds, NULL, NULL, NULL) == -1)
return -1;
}
- return read (stdio->fd, buf, length_buf);
+ return ::read (m_fd, buf, length_buf);
}
-static void
-stdio_file_write (struct ui_file *file, const char *buf, long length_buf)
+void
+stdio_file::write (const char *buf, long length_buf)
{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_write: bad magic number"));
/* Calling error crashes when we are called from the exception framework. */
- if (fwrite (buf, length_buf, 1, stdio->file))
+ if (fwrite (buf, length_buf, 1, m_file))
{
/* Nothing. */
}
}
-static void
-stdio_file_write_async_safe (struct ui_file *file,
- const char *buf, long length_buf)
+void
+stdio_file::write_async_safe (const char *buf, long length_buf)
{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- {
- /* gettext isn't necessarily async safe, so we can't use _("error message") here.
- We could extract the correct translation ahead of time, but this is an extremely
- rare event, and one of the other stdio_file_* routines will presumably catch
- the problem anyway. For now keep it simple and ignore the error here. */
- return;
- }
-
/* This is written the way it is to avoid a warning from gcc about not using the
result of write (since it can be declared with attribute warn_unused_result).
Alas casting to void doesn't work for this. */
- if (write (stdio->fd, buf, length_buf))
+ if (::write (m_fd, buf, length_buf))
{
/* Nothing. */
}
}
-static void
-stdio_file_fputs (const char *linebuffer, struct ui_file *file)
+void
+stdio_file::puts (const char *linebuffer)
{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_fputs: bad magic number"));
/* Calling error crashes when we are called from the exception framework. */
- if (fputs (linebuffer, stdio->file))
+ if (fputs (linebuffer, m_file))
{
/* Nothing. */
}
}
-static int
-stdio_file_isatty (struct ui_file *file)
+bool
+stdio_file::isatty ()
{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_isatty: bad magic number"));
- return (isatty (stdio->fd));
+ return ::isatty (m_fd);
}
-static int
-stdio_file_fseek (struct ui_file *file, long offset, int whence)
-{
- struct stdio_file *stdio = (struct stdio_file *) ui_file_data (file);
-
- if (stdio->magic != &stdio_file_magic)
- internal_error (__FILE__, __LINE__,
- _("stdio_file_fseek: bad magic number"));
-
- return fseek (stdio->file, offset, whence);
-}
+
-#ifdef __MINGW32__
-/* This is the implementation of ui_file method to_write for stderr.
+/* This is the implementation of ui_file method 'write' for stderr.
gdb_stdout is flushed before writing to gdb_stderr. */
-static void
-stderr_file_write (struct ui_file *file, const char *buf, long length_buf)
+void
+stderr_file::write (const char *buf, long length_buf)
{
gdb_flush (gdb_stdout);
- stdio_file_write (file, buf, length_buf);
+ stdio_file::write (buf, length_buf);
}
-/* This is the implementation of ui_file method to_fputs for stderr.
+/* This is the implementation of ui_file method 'puts' for stderr.
gdb_stdout is flushed before writing to gdb_stderr. */
-static void
-stderr_file_fputs (const char *linebuffer, struct ui_file *file)
+void
+stderr_file::puts (const char *linebuffer)
{
gdb_flush (gdb_stdout);
- stdio_file_fputs (linebuffer, file);
+ stdio_file::puts (linebuffer);
}
-#endif
-
-struct ui_file *
-stderr_fileopen (FILE *stream)
-{
- struct ui_file *ui_file = stdio_fileopen (stream);
-
-#ifdef __MINGW32__
- /* There is no real line-buffering on Windows, see
- http://msdn.microsoft.com/en-us/library/86cebhfs%28v=vs.71%29.aspx
- so the stdout is either fully-buffered or non-buffered. We can't
- make stdout non-buffered, because of two concerns,
- 1. non-buffering hurts performance,
- 2. non-buffering may change GDB's behavior when it is interacting
- with front-end, such as Emacs.
-
- We decided to leave stdout as fully buffered, but flush it first
- when something is written to stderr. */
-
- /* Method 'to_write_async_safe' is not overwritten, because there's
- no way to flush a stream in an async-safe manner. Fortunately,
- it doesn't really matter, because:
- - that method is only used for printing internal debug output
- from signal handlers.
- - Windows hosts don't have a concept of async-safeness. Signal
- handlers run in a separate thread, so they can call
- the regular non-async-safe output routines freely. */
- set_ui_file_write (ui_file, stderr_file_write);
- set_ui_file_fputs (ui_file, stderr_file_fputs);
-#endif
- return ui_file;
-}
-
-/* Like fdopen(). Create a ui_file from a previously opened FILE. */
-
-struct ui_file *
-stdio_fileopen (FILE *file)
-{
- return stdio_file_new (file, 0);
-}
+stderr_file::stderr_file (FILE *stream)
+ : stdio_file (stream)
+{}
-struct ui_file *
-gdb_fopen (const char *name, const char *mode)
-{
- FILE *f = gdb_fopen_cloexec (name, mode);
-
- if (f == NULL)
- return NULL;
- return stdio_file_new (f, 1);
-}
-
-/* ``struct ui_file'' implementation that maps onto two ui-file objects. */
-
-static ui_file_write_ftype tee_file_write;
-static ui_file_fputs_ftype tee_file_fputs;
-static ui_file_isatty_ftype tee_file_isatty;
-static ui_file_delete_ftype tee_file_delete;
-static ui_file_flush_ftype tee_file_flush;
+
-static int tee_file_magic;
+tee_file::tee_file (ui_file *one, bool close_one,
+ ui_file *two, bool close_two)
+ : m_one (one),
+ m_two (two),
+ m_close_one (close_one),
+ m_close_two (close_two)
+{}
-struct tee_file
- {
- int *magic;
- struct ui_file *one, *two;
- int close_one, close_two;
- };
-
-struct ui_file *
-tee_file_new (struct ui_file *one, int close_one,
- struct ui_file *two, int close_two)
+tee_file::~tee_file ()
{
- struct ui_file *ui_file = ui_file_new ();
- struct tee_file *tee = XNEW (struct tee_file);
-
- tee->magic = &tee_file_magic;
- tee->one = one;
- tee->two = two;
- tee->close_one = close_one;
- tee->close_two = close_two;
- set_ui_file_data (ui_file, tee, tee_file_delete);
- set_ui_file_flush (ui_file, tee_file_flush);
- set_ui_file_write (ui_file, tee_file_write);
- set_ui_file_fputs (ui_file, tee_file_fputs);
- set_ui_file_isatty (ui_file, tee_file_isatty);
- return ui_file;
+ if (m_close_one)
+ delete m_one;
+ if (m_close_two)
+ delete m_two;
}
-static void
-tee_file_delete (struct ui_file *file)
+void
+tee_file::flush ()
{
- struct tee_file *tee = (struct tee_file *) ui_file_data (file);
-
- if (tee->magic != &tee_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tee_file_delete: bad magic number"));
- if (tee->close_one)
- ui_file_delete (tee->one);
- if (tee->close_two)
- ui_file_delete (tee->two);
-
- xfree (tee);
+ m_one->flush ();
+ m_two->flush ();
}
-static void
-tee_file_flush (struct ui_file *file)
+void
+tee_file::write (const char *buf, long length_buf)
{
- struct tee_file *tee = (struct tee_file *) ui_file_data (file);
-
- if (tee->magic != &tee_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tee_file_flush: bad magic number"));
- tee->one->to_flush (tee->one);
- tee->two->to_flush (tee->two);
+ m_one->write (buf, length_buf);
+ m_two->write (buf, length_buf);
}
-static void
-tee_file_write (struct ui_file *file, const char *buf, long length_buf)
+void
+tee_file::write_async_safe (const char *buf, long length_buf)
{
- struct tee_file *tee = (struct tee_file *) ui_file_data (file);
-
- if (tee->magic != &tee_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tee_file_write: bad magic number"));
- ui_file_write (tee->one, buf, length_buf);
- ui_file_write (tee->two, buf, length_buf);
+ m_one->write_async_safe (buf, length_buf);
+ m_two->write_async_safe (buf, length_buf);
}
-static void
-tee_file_fputs (const char *linebuffer, struct ui_file *file)
+void
+tee_file::puts (const char *linebuffer)
{
- struct tee_file *tee = (struct tee_file *) ui_file_data (file);
-
- if (tee->magic != &tee_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tee_file_fputs: bad magic number"));
- tee->one->to_fputs (linebuffer, tee->one);
- tee->two->to_fputs (linebuffer, tee->two);
+ m_one->puts (linebuffer);
+ m_two->puts (linebuffer);
}
-static int
-tee_file_isatty (struct ui_file *file)
+bool
+tee_file::isatty ()
{
- struct tee_file *tee = (struct tee_file *) ui_file_data (file);
-
- if (tee->magic != &tee_file_magic)
- internal_error (__FILE__, __LINE__,
- _("tee_file_isatty: bad magic number"));
-
- return ui_file_isatty (tee->one);
+ return m_one->isatty ();
}