[Lldb-commits] [lldb] r219435 - Correctly fix ScriptInterpreterPython::ExecuteOneLine for windows.

[Zachary Turner]

Author: zturner
Date: Thu Oct  9 15:17:53 2014
New Revision: 219435

URL: http://llvm.org/viewvc/llvm-project?rev=219435&view=rev
Log:
Correctly fix ScriptInterpreterPython::ExecuteOneLine for windows.

Modified:
    lldb/trunk/include/lldb/Host/TimeValue.h
    lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp

Modified: lldb/trunk/include/lldb/Host/TimeValue.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/TimeValue.h?rev=219435&r1=219434&r2=219435&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Host/TimeValue.h (original)
+++ lldb/trunk/include/lldb/Host/TimeValue.h Thu Oct  9 15:17:53 2014
@@ -100,11 +100,11 @@ public:
 
     /// Returns only the fractional portion of the TimeValue rounded down to the
     /// nearest millisecond (divide by one million).
-    /// @brief Retrieve the fractional part as milliseconds;
+    /// @brief Retrieve the milliseconds component;
     uint32_t
     milliseconds() const
     {
-        return nanoseconds() / NanoSecPerMilliSec;
+        return m_nano_seconds / NanoSecPerMilliSec;
     }
 
 protected:

Modified: lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp?rev=219435&r1=219434&r2=219435&view=diff
==============================================================================
--- lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp (original)
+++ lldb/trunk/source/Host/windows/ConnectionGenericFileWindows.cpp Thu Oct  9 15:17:53 2014
@@ -229,7 +229,7 @@ ConnectionGenericFile::Read(void *dst, s
             // ERROR_OPERATION_ABORTED occurs when someone calls Disconnect() during a blocking read.
             // This triggers a call to CancelIoEx, which causes the operation to complete and the
             // result to be ERROR_OPERATION_ABORTED.
-            if (result_error == ERROR_HANDLE_EOF || result_error == ERROR_OPERATION_ABORTED)
+            if (result_error == ERROR_HANDLE_EOF || result_error == ERROR_OPERATION_ABORTED || result_error == ERROR_BROKEN_PIPE)
                 return_info.Set(bytes_read, eConnectionStatusEndOfFile, 0);
             else
                 return_info.Set(bytes_read, eConnectionStatusError, result_error);