diff options
| author | Greg Clayton <gclayton@apple.com> | 2010-12-04 02:22:36 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2010-12-04 02:22:36 +0000 |
| commit | 7788e5fd642718993f3f70fff9d3f2030474f3cd (patch) | |
| tree | 427359c2afb64dcba515498b62cde5294092e611 /lldb/source/Core/Communication.cpp | |
| parent | fafa66500b331fca69bbe0298fd95737e1f95b3f (diff) | |
| download | bcm5719-llvm-7788e5fd642718993f3f70fff9d3f2030474f3cd.tar.gz bcm5719-llvm-7788e5fd642718993f3f70fff9d3f2030474f3cd.zip | |
Reverted the close on EOF stuff again as it was crashing Xcode.
llvm-svn: 120883
Diffstat (limited to 'lldb/source/Core/Communication.cpp')
| -rw-r--r-- | lldb/source/Core/Communication.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lldb/source/Core/Communication.cpp b/lldb/source/Core/Communication.cpp index f8de19810b1..9258a0cd403 100644 --- a/lldb/source/Core/Communication.cpp +++ b/lldb/source/Core/Communication.cpp @@ -266,8 +266,7 @@ Communication::AppendBytesToCache (const uint8_t * bytes, size_t len, bool broad lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION, "%p Communication::AppendBytesToCache (src = %p, src_len = %zu, broadcast = %i)", this, bytes, len, broadcast); - if ((bytes == NULL || len == 0) - && (status != eConnectionStatusEndOfFile)) + if (bytes == NULL || len == 0) return; if (m_callback) { @@ -327,21 +326,14 @@ Communication::ReadThread (void *p) size_t bytes_read = comm->ReadFromConnection (buf, sizeof(buf), status, &error); if (bytes_read > 0) comm->AppendBytesToCache (buf, bytes_read, true, status); - else if ((bytes_read == 0) - && status == eConnectionStatusEndOfFile) - { - if (comm->CloseOnEOF ()) - comm->Disconnect (); - comm->AppendBytesToCache (buf, bytes_read, true, status); - } } switch (status) { case eConnectionStatusSuccess: - case eConnectionStatusEndOfFile: break; + case eConnectionStatusEndOfFile: case eConnectionStatusNoConnection: // No connection case eConnectionStatusLostConnection: // Lost connection while connected to a valid connection done = true; |

