From 097cd6262df477a61752bb0e96b3e93df93c1430 Mon Sep 17 00:00:00 2001 From: Matt Kopec Date: Mon, 11 Mar 2013 22:31:31 +0000 Subject: [PATCH] Change Linux/POSIX to output inferior output in realtime. llvm-svn: 176833 --- .../Plugins/Process/POSIX/ProcessPOSIX.cpp | 24 ++----------------- .../Plugins/Process/POSIX/ProcessPOSIX.h | 6 ----- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp index 417b941a50b8..6f725f5c7e6a 100644 --- a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp +++ b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp @@ -206,6 +206,8 @@ ProcessPOSIX::DoLaunch (Module *module, if (!error.Success()) return error; + SetSTDIOFileDescriptor(m_monitor->GetTerminalFD()); + SetID(m_monitor->GetPID()); return error; } @@ -277,7 +279,6 @@ ProcessPOSIX::DoHalt(bool &caused_stop) { caused_stop = true; } - return error; } @@ -584,27 +585,6 @@ ProcessPOSIX::PutSTDIN(const char *buf, size_t len, Error &error) return status; } -size_t -ProcessPOSIX::GetSTDOUT(char *buf, size_t len, Error &error) -{ - ssize_t bytes_read; - - // The terminal file descriptor is always in non-block mode. - if ((bytes_read = read(m_monitor->GetTerminalFD(), buf, len)) < 0) - { - if (errno != EAGAIN) - error.SetErrorToErrno(); - return 0; - } - return bytes_read; -} - -size_t -ProcessPOSIX::GetSTDERR(char *buf, size_t len, Error &error) -{ - return GetSTDOUT(buf, len, error); -} - UnixSignals & ProcessPOSIX::GetUnixSignals() { diff --git a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h index 068686df99f3..b16da3aca742 100644 --- a/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h +++ b/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h @@ -124,12 +124,6 @@ public: virtual size_t PutSTDIN(const char *buf, size_t len, lldb_private::Error &error); - virtual size_t - GetSTDOUT(char *buf, size_t len, lldb_private::Error &error); - - virtual size_t - GetSTDERR(char *buf, size_t len, lldb_private::Error &error); - //-------------------------------------------------------------------------- // ProcessPOSIX internal API.