*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 322 insertions, 365 deletions

diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp
index dbd0f775eeb..a7114cea4ab 100644
--- a/lldb/source/Core/Communication.cpp
+++ b/lldb/source/Core/Communication.cpp
@@ -15,10 +15,10 @@
 // Project includes
 #include "lldb/Core/Communication.h"
 #include "lldb/Core/Connection.h"
+#include "lldb/Core/Event.h"
 #include "lldb/Core/Listener.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Timer.h"
-#include "lldb/Core/Event.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostThread.h"
 #include "lldb/Host/ThreadLauncher.h"
@@ -26,441 +26,398 @@
 using namespace lldb;
 using namespace lldb_private;
 
-ConstString &
-Communication::GetStaticBroadcasterClass ()
-{
-    static ConstString class_name ("lldb.communication");
-    return class_name;
+ConstString &Communication::GetStaticBroadcasterClass() {
+  static ConstString class_name("lldb.communication");
+  return class_name;
 }
 
 Communication::Communication(const char *name)
-    : Broadcaster(nullptr, name),
-      m_connection_sp(),
-      m_read_thread_enabled(false),
-      m_read_thread_did_exit(false),
-      m_bytes(),
-      m_bytes_mutex(),
-      m_write_mutex(),
-      m_synchronize_mutex(),
-      m_callback(nullptr),
-      m_callback_baton(nullptr),
-      m_close_on_eof(true)
+    : Broadcaster(nullptr, name), m_connection_sp(),
+      m_read_thread_enabled(false), m_read_thread_did_exit(false), m_bytes(),
+      m_bytes_mutex(), m_write_mutex(), m_synchronize_mutex(),
+      m_callback(nullptr), m_callback_baton(nullptr), m_close_on_eof(true)
 
 {
-    lldb_private::LogIfAnyCategoriesSet(LIBLLDB_LOG_OBJECT | LIBLLDB_LOG_COMMUNICATION,
-                                        "%p Communication::Communication (name = %s)", this, name);
-
-    SetEventName(eBroadcastBitDisconnected, "disconnected");
-    SetEventName(eBroadcastBitReadThreadGotBytes, "got bytes");
-    SetEventName(eBroadcastBitReadThreadDidExit, "read thread did exit");
-    SetEventName(eBroadcastBitReadThreadShouldExit, "read thread should exit");
-    SetEventName(eBroadcastBitPacketAvailable, "packet available");
-    SetEventName(eBroadcastBitNoMorePendingInput, "no more pending input");
-
-    CheckInWithManager();
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_OBJECT | LIBLLDB_LOG_COMMUNICATION,
+      "%p Communication::Communication (name = %s)", this, name);
+
+  SetEventName(eBroadcastBitDisconnected, "disconnected");
+  SetEventName(eBroadcastBitReadThreadGotBytes, "got bytes");
+  SetEventName(eBroadcastBitReadThreadDidExit, "read thread did exit");
+  SetEventName(eBroadcastBitReadThreadShouldExit, "read thread should exit");
+  SetEventName(eBroadcastBitPacketAvailable, "packet available");
+  SetEventName(eBroadcastBitNoMorePendingInput, "no more pending input");
+
+  CheckInWithManager();
 }
 
-Communication::~Communication()
-{
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_OBJECT | LIBLLDB_LOG_COMMUNICATION,
-                                 "%p Communication::~Communication (name = %s)",
-                                 this, GetBroadcasterName().AsCString());
-    Clear();
+Communication::~Communication() {
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_OBJECT | LIBLLDB_LOG_COMMUNICATION,
+      "%p Communication::~Communication (name = %s)", this,
+      GetBroadcasterName().AsCString());
+  Clear();
 }
 
-void
-Communication::Clear()
-{
-    SetReadThreadBytesReceivedCallback(nullptr, nullptr);
-    Disconnect(nullptr);
-    StopReadThread(nullptr);
+void Communication::Clear() {
+  SetReadThreadBytesReceivedCallback(nullptr, nullptr);
+  Disconnect(nullptr);
+  StopReadThread(nullptr);
 }
 
-ConnectionStatus
-Communication::Connect (const char *url, Error *error_ptr)
-{
-    Clear();
+ConnectionStatus Communication::Connect(const char *url, Error *error_ptr) {
+  Clear();
 
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION, "%p Communication::Connect (url = %s)", this, url);
+  lldb_private::LogIfAnyCategoriesSet(LIBLLDB_LOG_COMMUNICATION,
+                                      "%p Communication::Connect (url = %s)",
+                                      this, url);
 
-    lldb::ConnectionSP connection_sp (m_connection_sp);
-    if (connection_sp)
-        return connection_sp->Connect (url, error_ptr);
-    if (error_ptr)
-        error_ptr->SetErrorString("Invalid connection.");
-    return eConnectionStatusNoConnection;
+  lldb::ConnectionSP connection_sp(m_connection_sp);
+  if (connection_sp)
+    return connection_sp->Connect(url, error_ptr);
+  if (error_ptr)
+    error_ptr->SetErrorString("Invalid connection.");
+  return eConnectionStatusNoConnection;
 }
 
-ConnectionStatus
-Communication::Disconnect (Error *error_ptr)
-{
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION, "%p Communication::Disconnect ()", this);
-
-    lldb::ConnectionSP connection_sp (m_connection_sp);
-    if (connection_sp)
-    {
-        ConnectionStatus status = connection_sp->Disconnect (error_ptr);
-        // We currently don't protect connection_sp with any mutex for 
-        // multi-threaded environments. So lets not nuke our connection class 
-        // without putting some multi-threaded protections in. We also probably
-        // don't want to pay for the overhead it might cause if every time we
-        // access the connection we have to take a lock.
-        //
-        // This unique pointer will cleanup after itself when this object goes away,
-        // so there is no need to currently have it destroy itself immediately
-        // upon disconnnect.
-        //connection_sp.reset();
-        return status;
-    }
-    return eConnectionStatusNoConnection;
+ConnectionStatus Communication::Disconnect(Error *error_ptr) {
+  lldb_private::LogIfAnyCategoriesSet(LIBLLDB_LOG_COMMUNICATION,
+                                      "%p Communication::Disconnect ()", this);
+
+  lldb::ConnectionSP connection_sp(m_connection_sp);
+  if (connection_sp) {
+    ConnectionStatus status = connection_sp->Disconnect(error_ptr);
+    // We currently don't protect connection_sp with any mutex for
+    // multi-threaded environments. So lets not nuke our connection class
+    // without putting some multi-threaded protections in. We also probably
+    // don't want to pay for the overhead it might cause if every time we
+    // access the connection we have to take a lock.
+    //
+    // This unique pointer will cleanup after itself when this object goes away,
+    // so there is no need to currently have it destroy itself immediately
+    // upon disconnnect.
+    // connection_sp.reset();
+    return status;
+  }
+  return eConnectionStatusNoConnection;
 }
 
-bool
-Communication::IsConnected () const
-{
-    lldb::ConnectionSP connection_sp(m_connection_sp);
-    return (connection_sp ? connection_sp->IsConnected() : false);
+bool Communication::IsConnected() const {
+  lldb::ConnectionSP connection_sp(m_connection_sp);
+  return (connection_sp ? connection_sp->IsConnected() : false);
 }
 
-bool
-Communication::HasConnection () const
-{
-    return m_connection_sp.get() != nullptr;
+bool Communication::HasConnection() const {
+  return m_connection_sp.get() != nullptr;
 }
 
-size_t
-Communication::Read (void *dst, size_t dst_len, uint32_t timeout_usec, ConnectionStatus &status, Error *error_ptr)
-{
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
-                                         "%p Communication::Read (dst = %p, dst_len = %" PRIu64 ", timeout = %u usec) connection = %p",
-                                         this, 
-                                         dst, 
-                                         (uint64_t)dst_len,
-                                         timeout_usec, 
-                                         m_connection_sp.get());
-
-    if (m_read_thread_enabled)
-    {
-        // We have a dedicated read thread that is getting data for us
-        size_t cached_bytes = GetCachedBytes (dst, dst_len);
-        if (cached_bytes > 0 || timeout_usec == 0)
-        {
-            status = eConnectionStatusSuccess;
-            return cached_bytes;
-        }
-
-        if (!m_connection_sp)
-        {
-            if (error_ptr)
-                error_ptr->SetErrorString("Invalid connection.");
-            status = eConnectionStatusNoConnection;
-            return 0;
-        }
-
-        ListenerSP listener_sp(Listener::MakeListener("Communication::Read"));
-        listener_sp->StartListeningForEvents (this, eBroadcastBitReadThreadGotBytes | eBroadcastBitReadThreadDidExit);
-        EventSP event_sp;
-        std::chrono::microseconds timeout = std::chrono::microseconds(0);
-        if (timeout_usec != UINT32_MAX)
-            timeout = std::chrono::microseconds(timeout_usec);
-        while (listener_sp->WaitForEvent(timeout, event_sp))
-        {
-            const uint32_t event_type = event_sp->GetType();
-            if (event_type & eBroadcastBitReadThreadGotBytes)
-            {
-                return GetCachedBytes (dst, dst_len);
-            }
-
-            if (event_type & eBroadcastBitReadThreadDidExit)
-            {
-                if (GetCloseOnEOF ())
-                    Disconnect(nullptr);
-                break;
-            }
-        }
-        return 0;
+size_t Communication::Read(void *dst, size_t dst_len, uint32_t timeout_usec,
+                           ConnectionStatus &status, Error *error_ptr) {
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_COMMUNICATION,
+      "%p Communication::Read (dst = %p, dst_len = %" PRIu64
+      ", timeout = %u usec) connection = %p",
+      this, dst, (uint64_t)dst_len, timeout_usec, m_connection_sp.get());
+
+  if (m_read_thread_enabled) {
+    // We have a dedicated read thread that is getting data for us
+    size_t cached_bytes = GetCachedBytes(dst, dst_len);
+    if (cached_bytes > 0 || timeout_usec == 0) {
+      status = eConnectionStatusSuccess;
+      return cached_bytes;
     }
 
-    // We aren't using a read thread, just read the data synchronously in this
-    // thread.
-    lldb::ConnectionSP connection_sp (m_connection_sp);
-    if (connection_sp)
-    {
-        return connection_sp->Read (dst, dst_len, timeout_usec, status, error_ptr);
+    if (!m_connection_sp) {
+      if (error_ptr)
+        error_ptr->SetErrorString("Invalid connection.");
+      status = eConnectionStatusNoConnection;
+      return 0;
     }
 
-    if (error_ptr)
-        error_ptr->SetErrorString("Invalid connection.");
-    status = eConnectionStatusNoConnection;
+    ListenerSP listener_sp(Listener::MakeListener("Communication::Read"));
+    listener_sp->StartListeningForEvents(
+        this, eBroadcastBitReadThreadGotBytes | eBroadcastBitReadThreadDidExit);
+    EventSP event_sp;
+    std::chrono::microseconds timeout = std::chrono::microseconds(0);
+    if (timeout_usec != UINT32_MAX)
+      timeout = std::chrono::microseconds(timeout_usec);
+    while (listener_sp->WaitForEvent(timeout, event_sp)) {
+      const uint32_t event_type = event_sp->GetType();
+      if (event_type & eBroadcastBitReadThreadGotBytes) {
+        return GetCachedBytes(dst, dst_len);
+      }
+
+      if (event_type & eBroadcastBitReadThreadDidExit) {
+        if (GetCloseOnEOF())
+          Disconnect(nullptr);
+        break;
+      }
+    }
     return 0;
+  }
+
+  // We aren't using a read thread, just read the data synchronously in this
+  // thread.
+  lldb::ConnectionSP connection_sp(m_connection_sp);
+  if (connection_sp) {
+    return connection_sp->Read(dst, dst_len, timeout_usec, status, error_ptr);
+  }
+
+  if (error_ptr)
+    error_ptr->SetErrorString("Invalid connection.");
+  status = eConnectionStatusNoConnection;
+  return 0;
 }
 
-size_t
-Communication::Write (const void *src, size_t src_len, ConnectionStatus &status, Error *error_ptr)
-{
-    lldb::ConnectionSP connection_sp (m_connection_sp);
+size_t Communication::Write(const void *src, size_t src_len,
+                            ConnectionStatus &status, Error *error_ptr) {
+  lldb::ConnectionSP connection_sp(m_connection_sp);
 
-    std::lock_guard<std::mutex> guard(m_write_mutex);
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
-                                         "%p Communication::Write (src = %p, src_len = %" PRIu64 ") connection = %p",
-                                         this, 
-                                         src, 
-                                         (uint64_t)src_len,
-                                         connection_sp.get());
+  std::lock_guard<std::mutex> guard(m_write_mutex);
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_COMMUNICATION,
+      "%p Communication::Write (src = %p, src_len = %" PRIu64
+      ") connection = %p",
+      this, src, (uint64_t)src_len, connection_sp.get());
 
-    if (connection_sp)
-        return connection_sp->Write (src, src_len, status, error_ptr);
+  if (connection_sp)
+    return connection_sp->Write(src, src_len, status, error_ptr);
 
-    if (error_ptr)
-        error_ptr->SetErrorString("Invalid connection.");
-    status = eConnectionStatusNoConnection;
-    return 0;
+  if (error_ptr)
+    error_ptr->SetErrorString("Invalid connection.");
+  status = eConnectionStatusNoConnection;
+  return 0;
 }
 
-bool
-Communication::StartReadThread (Error *error_ptr)
-{
-    if (error_ptr)
-        error_ptr->Clear();
+bool Communication::StartReadThread(Error *error_ptr) {
+  if (error_ptr)
+    error_ptr->Clear();
 
-    if (m_read_thread.IsJoinable())
-        return true;
+  if (m_read_thread.IsJoinable())
+    return true;
 
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
-                                 "%p Communication::StartReadThread ()", this);
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_COMMUNICATION, "%p Communication::StartReadThread ()", this);
 
-    char thread_name[1024];
-    snprintf(thread_name, sizeof(thread_name), "<lldb.comm.%s>", GetBroadcasterName().AsCString());
+  char thread_name[1024];
+  snprintf(thread_name, sizeof(thread_name), "<lldb.comm.%s>",
+           GetBroadcasterName().AsCString());
 
-    m_read_thread_enabled = true;
-    m_read_thread_did_exit = false;
-    m_read_thread = ThreadLauncher::LaunchThread(thread_name, Communication::ReadThread, this, error_ptr);
-    if (!m_read_thread.IsJoinable())
-        m_read_thread_enabled = false;
-    return m_read_thread_enabled;
+  m_read_thread_enabled = true;
+  m_read_thread_did_exit = false;
+  m_read_thread = ThreadLauncher::LaunchThread(
+      thread_name, Communication::ReadThread, this, error_ptr);
+  if (!m_read_thread.IsJoinable())
+    m_read_thread_enabled = false;
+  return m_read_thread_enabled;
 }
 
-bool
-Communication::StopReadThread (Error *error_ptr)
-{
-    if (!m_read_thread.IsJoinable())
-        return true;
+bool Communication::StopReadThread(Error *error_ptr) {
+  if (!m_read_thread.IsJoinable())
+    return true;
 
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
-                                 "%p Communication::StopReadThread ()", this);
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_COMMUNICATION, "%p Communication::StopReadThread ()", this);
 
-    m_read_thread_enabled = false;
+  m_read_thread_enabled = false;
 
-    BroadcastEvent(eBroadcastBitReadThreadShouldExit, nullptr);
+  BroadcastEvent(eBroadcastBitReadThreadShouldExit, nullptr);
 
-    // error = m_read_thread.Cancel();
+  // error = m_read_thread.Cancel();
 
-    Error error = m_read_thread.Join(nullptr);
-    return error.Success();
+  Error error = m_read_thread.Join(nullptr);
+  return error.Success();
 }
 
-bool
-Communication::JoinReadThread (Error *error_ptr)
-{
-    if (!m_read_thread.IsJoinable())
-        return true;
+bool Communication::JoinReadThread(Error *error_ptr) {
+  if (!m_read_thread.IsJoinable())
+    return true;
 
-    Error error = m_read_thread.Join(nullptr);
-    return error.Success();
+  Error error = m_read_thread.Join(nullptr);
+  return error.Success();
 }
 
-size_t
-Communication::GetCachedBytes (void *dst, size_t dst_len)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_bytes_mutex);
-    if (!m_bytes.empty())
-    {
-        // If DST is nullptr and we have a thread, then return the number
-        // of bytes that are available so the caller can call again
-        if (dst == nullptr)
-            return m_bytes.size();
+size_t Communication::GetCachedBytes(void *dst, size_t dst_len) {
+  std::lock_guard<std::recursive_mutex> guard(m_bytes_mutex);
+  if (!m_bytes.empty()) {
+    // If DST is nullptr and we have a thread, then return the number
+    // of bytes that are available so the caller can call again
+    if (dst == nullptr)
+      return m_bytes.size();
 
-        const size_t len = std::min<size_t>(dst_len, m_bytes.size());
+    const size_t len = std::min<size_t>(dst_len, m_bytes.size());
 
-        ::memcpy (dst, m_bytes.c_str(), len);
-        m_bytes.erase(m_bytes.begin(), m_bytes.begin() + len);
+    ::memcpy(dst, m_bytes.c_str(), len);
+    m_bytes.erase(m_bytes.begin(), m_bytes.begin() + len);
 
-        return len;
-    }
-    return 0;
+    return len;
+  }
+  return 0;
 }
 
-void
-Communication::AppendBytesToCache (const uint8_t * bytes, size_t len, bool broadcast, ConnectionStatus status)
-{
-    lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
-                                 "%p Communication::AppendBytesToCache (src = %p, src_len = %" PRIu64 ", broadcast = %i)",
-                                 this, bytes, (uint64_t)len, broadcast);
-    if ((bytes == nullptr || len == 0)
-        && (status != lldb::eConnectionStatusEndOfFile))
-        return;
-    if (m_callback)
-    {
-        // If the user registered a callback, then call it and do not broadcast
-        m_callback (m_callback_baton, bytes, len);
-    }
-    else if (bytes != nullptr && len > 0)
-    {
-        std::lock_guard<std::recursive_mutex> guard(m_bytes_mutex);
-        m_bytes.append ((const char *)bytes, len);
-        if (broadcast)
-            BroadcastEventIfUnique (eBroadcastBitReadThreadGotBytes);
-    }
+void Communication::AppendBytesToCache(const uint8_t *bytes, size_t len,
+                                       bool broadcast,
+                                       ConnectionStatus status) {
+  lldb_private::LogIfAnyCategoriesSet(
+      LIBLLDB_LOG_COMMUNICATION,
+      "%p Communication::AppendBytesToCache (src = %p, src_len = %" PRIu64
+      ", broadcast = %i)",
+      this, bytes, (uint64_t)len, broadcast);
+  if ((bytes == nullptr || len == 0) &&
+      (status != lldb::eConnectionStatusEndOfFile))
+    return;
+  if (m_callback) {
+    // If the user registered a callback, then call it and do not broadcast
+    m_callback(m_callback_baton, bytes, len);
+  } else if (bytes != nullptr && len > 0) {
+    std::lock_guard<std::recursive_mutex> guard(m_bytes_mutex);
+    m_bytes.append((const char *)bytes, len);
+    if (broadcast)
+      BroadcastEventIfUnique(eBroadcastBitReadThreadGotBytes);
+  }
 }
 
-size_t
-Communication::ReadFromConnection (void *dst, 
-                                   size_t dst_len, 
-                                   uint32_t timeout_usec,
-                                   ConnectionStatus &status, 
-                                   Error *error_ptr)
-{
-    lldb::ConnectionSP connection_sp(m_connection_sp);
-    return (connection_sp ? connection_sp->Read(dst, dst_len, timeout_usec, status, error_ptr) : 0);
+size_t Communication::ReadFromConnection(void *dst, size_t dst_len,
+                                         uint32_t timeout_usec,
+                                         ConnectionStatus &status,
+                                         Error *error_ptr) {
+  lldb::ConnectionSP connection_sp(m_connection_sp);
+  return (
+      connection_sp
+          ? connection_sp->Read(dst, dst_len, timeout_usec, status, error_ptr)
+          : 0);
 }
 
-bool
-Communication::ReadThreadIsRunning ()
-{
-    return m_read_thread_enabled;
-}
+bool Communication::ReadThreadIsRunning() { return m_read_thread_enabled; }
 
-lldb::thread_result_t
-Communication::ReadThread (lldb::thread_arg_t p)
-{
-    Communication *comm = (Communication *)p;
-
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMUNICATION));
-
-    if (log)
-        log->Printf ("%p Communication::ReadThread () thread starting...", p);
-
-    uint8_t buf[1024];
-
-    Error error;
-    ConnectionStatus status = eConnectionStatusSuccess;
-    bool done = false;
-    while (!done && comm->m_read_thread_enabled)
-    {
-        size_t bytes_read = comm->ReadFromConnection (buf, sizeof(buf), 5 * TimeValue::MicroSecPerSec, status, &error);
-        if (bytes_read > 0)
-            comm->AppendBytesToCache (buf, bytes_read, true, status);
-        else if ((bytes_read == 0)
-                && status == eConnectionStatusEndOfFile)
-        {
-            if (comm->GetCloseOnEOF ())
-                comm->Disconnect ();
-            comm->AppendBytesToCache (buf, bytes_read, true, status);
-        }
-
-        switch (status)
-        {
-        case eConnectionStatusSuccess:
-            break;
-
-        case eConnectionStatusEndOfFile:
-            done = true;
-            break;
-        case eConnectionStatusError:            // Check GetError() for details
-            if (error.GetType() == eErrorTypePOSIX && error.GetError() == EIO)
-            {
-                // EIO on a pipe is usually caused by remote shutdown
-                comm->Disconnect ();
-                done = true;
-            }
-            if (log)
-                error.LogIfError (log,
-                                  "%p Communication::ReadFromConnection () => status = %s",
-                                  p,
-                                  Communication::ConnectionStatusAsCString (status));
-            break;
-        case eConnectionStatusInterrupted:      // Synchronization signal from SynchronizeWithReadThread()
-            // The connection returns eConnectionStatusInterrupted only when there is no
-            // input pending to be read, so we can signal that.
-            comm->BroadcastEvent (eBroadcastBitNoMorePendingInput);
-            break;
-        case eConnectionStatusNoConnection:     // No connection
-        case eConnectionStatusLostConnection:   // Lost connection while connected to a valid connection
-            done = true;
-            LLVM_FALLTHROUGH;
-        case eConnectionStatusTimedOut:         // Request timed out
-            if (log)
-                error.LogIfError (log,
-                                  "%p Communication::ReadFromConnection () => status = %s",
-                                  p,
-                                  Communication::ConnectionStatusAsCString (status));
-            break;
-        }
+lldb::thread_result_t Communication::ReadThread(lldb::thread_arg_t p) {
+  Communication *comm = (Communication *)p;
+
+  Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_COMMUNICATION));
+
+  if (log)
+    log->Printf("%p Communication::ReadThread () thread starting...", p);
+
+  uint8_t buf[1024];
+
+  Error error;
+  ConnectionStatus status = eConnectionStatusSuccess;
+  bool done = false;
+  while (!done && comm->m_read_thread_enabled) {
+    size_t bytes_read = comm->ReadFromConnection(
+        buf, sizeof(buf), 5 * TimeValue::MicroSecPerSec, status, &error);
+    if (bytes_read > 0)
+      comm->AppendBytesToCache(buf, bytes_read, true, status);
+    else if ((bytes_read == 0) && status == eConnectionStatusEndOfFile) {
+      if (comm->GetCloseOnEOF())
+        comm->Disconnect();
+      comm->AppendBytesToCache(buf, bytes_read, true, status);
     }
-    log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_COMMUNICATION);
-    if (log)
-        log->Printf ("%p Communication::ReadThread () thread exiting...", p);
-
-    comm->m_read_thread_did_exit = true;
-    // Let clients know that this thread is exiting
-    comm->BroadcastEvent (eBroadcastBitNoMorePendingInput);
-    comm->BroadcastEvent (eBroadcastBitReadThreadDidExit);
-    return NULL;
+
+    switch (status) {
+    case eConnectionStatusSuccess:
+      break;
+
+    case eConnectionStatusEndOfFile:
+      done = true;
+      break;
+    case eConnectionStatusError: // Check GetError() for details
+      if (error.GetType() == eErrorTypePOSIX && error.GetError() == EIO) {
+        // EIO on a pipe is usually caused by remote shutdown
+        comm->Disconnect();
+        done = true;
+      }
+      if (log)
+        error.LogIfError(
+            log, "%p Communication::ReadFromConnection () => status = %s", p,
+            Communication::ConnectionStatusAsCString(status));
+      break;
+    case eConnectionStatusInterrupted: // Synchronization signal from
+                                       // SynchronizeWithReadThread()
+      // The connection returns eConnectionStatusInterrupted only when there is
+      // no
+      // input pending to be read, so we can signal that.
+      comm->BroadcastEvent(eBroadcastBitNoMorePendingInput);
+      break;
+    case eConnectionStatusNoConnection:   // No connection
+    case eConnectionStatusLostConnection: // Lost connection while connected to
+                                          // a valid connection
+      done = true;
+      LLVM_FALLTHROUGH;
+    case eConnectionStatusTimedOut: // Request timed out
+      if (log)
+        error.LogIfError(
+            log, "%p Communication::ReadFromConnection () => status = %s", p,
+            Communication::ConnectionStatusAsCString(status));
+      break;
+    }
+  }
+  log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_COMMUNICATION);
+  if (log)
+    log->Printf("%p Communication::ReadThread () thread exiting...", p);
+
+  comm->m_read_thread_did_exit = true;
+  // Let clients know that this thread is exiting
+  comm->BroadcastEvent(eBroadcastBitNoMorePendingInput);
+  comm->BroadcastEvent(eBroadcastBitReadThreadDidExit);
+  return NULL;
 }
 
-void
-Communication::SetReadThreadBytesReceivedCallback(ReadThreadBytesReceived callback,
-                                                  void *callback_baton)
-{
-    m_callback = callback;
-    m_callback_baton = callback_baton;
+void Communication::SetReadThreadBytesReceivedCallback(
+    ReadThreadBytesReceived callback, void *callback_baton) {
+  m_callback = callback;
+  m_callback_baton = callback_baton;
 }
 
-void
-Communication::SynchronizeWithReadThread ()
-{
-    // Only one thread can do the synchronization dance at a time.
-    std::lock_guard<std::mutex> guard(m_synchronize_mutex);
+void Communication::SynchronizeWithReadThread() {
+  // Only one thread can do the synchronization dance at a time.
+  std::lock_guard<std::mutex> guard(m_synchronize_mutex);
 
-    // First start listening for the synchronization event.
-    ListenerSP listener_sp(Listener::MakeListener("Communication::SyncronizeWithReadThread"));
-    listener_sp->StartListeningForEvents(this, eBroadcastBitNoMorePendingInput);
+  // First start listening for the synchronization event.
+  ListenerSP listener_sp(
+      Listener::MakeListener("Communication::SyncronizeWithReadThread"));
+  listener_sp->StartListeningForEvents(this, eBroadcastBitNoMorePendingInput);
 
-    // If the thread is not running, there is no point in synchronizing.
-    if (!m_read_thread_enabled || m_read_thread_did_exit)
-        return;
+  // If the thread is not running, there is no point in synchronizing.
+  if (!m_read_thread_enabled || m_read_thread_did_exit)
+    return;
 
-    // Notify the read thread.
-    m_connection_sp->InterruptRead();
+  // Notify the read thread.
+  m_connection_sp->InterruptRead();
 
-    // Wait for the synchronization event.
-    EventSP event_sp;
-    listener_sp->WaitForEvent(std::chrono::microseconds(0), event_sp);
+  // Wait for the synchronization event.
+  EventSP event_sp;
+  listener_sp->WaitForEvent(std::chrono::microseconds(0), event_sp);
 }
 
-void
-Communication::SetConnection (Connection *connection)
-{
-    Disconnect(nullptr);
-    StopReadThread(nullptr);
-    m_connection_sp.reset(connection);
+void Communication::SetConnection(Connection *connection) {
+  Disconnect(nullptr);
+  StopReadThread(nullptr);
+  m_connection_sp.reset(connection);
 }
 
 const char *
-Communication::ConnectionStatusAsCString (lldb::ConnectionStatus status)
-{
-    switch (status)
-    {
-    case eConnectionStatusSuccess:        return "success";
-    case eConnectionStatusError:          return "error";
-    case eConnectionStatusTimedOut:       return "timed out";
-    case eConnectionStatusNoConnection:   return "no connection";
-    case eConnectionStatusLostConnection: return "lost connection";
-    case eConnectionStatusEndOfFile:      return "end of file";
-    case eConnectionStatusInterrupted:    return "interrupted";
-    }
-
-    static char unknown_state_string[64];
-    snprintf(unknown_state_string, sizeof (unknown_state_string), "ConnectionStatus = %i", status);
-    return unknown_state_string;
+Communication::ConnectionStatusAsCString(lldb::ConnectionStatus status) {
+  switch (status) {
+  case eConnectionStatusSuccess:
+    return "success";
+  case eConnectionStatusError:
+    return "error";
+  case eConnectionStatusTimedOut:
+    return "timed out";
+  case eConnectionStatusNoConnection:
+    return "no connection";
+  case eConnectionStatusLostConnection:
+    return "lost connection";
+  case eConnectionStatusEndOfFile:
+    return "end of file";
+  case eConnectionStatusInterrupted:
+    return "interrupted";
+  }
+
+  static char unknown_state_string[64];
+  snprintf(unknown_state_string, sizeof(unknown_state_string),
+           "ConnectionStatus = %i", status);
+  return unknown_state_string;
 }