diff options
author | Tom Tromey <tromey@adacore.com> | 2022-08-11 14:03:55 -0600 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2022-08-31 11:03:40 -0600 |
commit | 90621f6922ec7da513a2af46234bb5ae11a663ae (patch) | |
tree | 3c2dc40592e47eb79809ae6a2fbf215f402195b8 /gdb/tui | |
parent | b8043d27217ff89abba733476cb71c3656f5722a (diff) | |
download | gdb-90621f6922ec7da513a2af46234bb5ae11a663ae.zip gdb-90621f6922ec7da513a2af46234bb5ae11a663ae.tar.gz gdb-90621f6922ec7da513a2af46234bb5ae11a663ae.tar.bz2 |
TUI stdout buffering cleanup
The TUI checks against gdb_stdout to decide when to buffer. It seems
much cleaner to me to simply record this as an attribute of the stream
itself.
Diffstat (limited to 'gdb/tui')
-rw-r--r-- | gdb/tui/tui-file.c | 23 | ||||
-rw-r--r-- | gdb/tui/tui-file.h | 10 | ||||
-rw-r--r-- | gdb/tui/tui-io.c | 4 |
3 files changed, 14 insertions, 23 deletions
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c index 49dafce..3cf3dbc 100644 --- a/gdb/tui/tui-file.c +++ b/gdb/tui/tui-file.c @@ -22,24 +22,11 @@ #include "tui/tui-command.h" #include "tui.h" -tui_file::tui_file (FILE *stream) - : stdio_file (stream) -{} - -/* All TUI I/O sent to the *_filtered and *_unfiltered functions - eventually ends up here. The fputs_unfiltered_hook is primarily - used by GUIs to collect all output and send it to the GUI, instead - of the controlling terminal. Only output to gdb_stdout and - gdb_stderr are sent to the hook. Everything else is sent on to - fputs to allow file I/O to be handled appropriately. */ - void tui_file::puts (const char *linebuffer) { tui_puts (linebuffer); - /* gdb_stdout is buffered, and the caller must gdb_flush it at - appropriate times. Other streams are not so buffered. */ - if (this != gdb_stdout) + if (!m_buffered) tui_refresh_cmd_win (); } @@ -47,18 +34,14 @@ void tui_file::write (const char *buf, long length_buf) { tui_write (buf, length_buf); - /* gdb_stdout is buffered, and the caller must gdb_flush it at - appropriate times. Other streams are not so buffered. */ - if (this != gdb_stdout) + if (!m_buffered) tui_refresh_cmd_win (); } void tui_file::flush () { - /* gdb_stdout is buffered. Other files are always flushed on - every write. */ - if (this == gdb_stdout) + if (m_buffered) tui_refresh_cmd_win (); stdio_file::flush (); } diff --git a/gdb/tui/tui-file.h b/gdb/tui/tui-file.h index 1b28780..ff60ded 100644 --- a/gdb/tui/tui-file.h +++ b/gdb/tui/tui-file.h @@ -26,11 +26,19 @@ class tui_file : public stdio_file { public: - explicit tui_file (FILE *stream); + tui_file (FILE *stream, bool buffered) + : stdio_file (stream), + m_buffered (buffered) + {} void write (const char *buf, long length_buf) override; void puts (const char *) override; void flush () override; + +private: + + /* True if this stream is buffered. */ + bool m_buffered; }; #endif /* TUI_TUI_FILE_H */ diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 9f27f8b..0efaf69 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -904,8 +904,8 @@ tui_initialize_io (void) #endif /* Create tui output streams. */ - tui_stdout = new pager_file (new tui_file (stdout)); - tui_stderr = new tui_file (stderr); + tui_stdout = new pager_file (new tui_file (stdout, true)); + tui_stderr = new tui_file (stderr, false); tui_stdlog = new timestamped_file (tui_stderr); tui_out = new tui_ui_out (tui_stdout); |