ruby: move stall and wakeup functions to AbstractController

[gem5.git] / src / cpu / nativetrace.hh

diff --git a/src/cpu/nativetrace.hh b/src/cpu/nativetrace.hh
index 5c5b9a66d2b83a0758a4cdc821e478c930e19a09..f6bf63d76f62ce9ecfea9c12e7a4fa8cb7f7bd3f 100644 (file)
--- a/src/cpu/nativetrace.hh
+++ b/src/cpu/nativetrace.hh
@@ -31,9 +31,10 @@
 #ifndef __CPU_NATIVETRACE_HH__
 #define __CPU_NATIVETRACE_HH__
 
-#include <errno.h>
 #include <unistd.h>
 
+#include <cerrno>
+
 #include "base/socket.hh"
 #include "base/trace.hh"
 #include "base/types.hh"
@@ -107,7 +108,7 @@ class NativeTrace : public ExeTracer
     {
         size_t soFar = 0;
         while (soFar < size) {
-            size_t res = ::read(fd, (uint8_t *)ptr + soFar, size - soFar);
+            ssize_t res = ::read(fd, (uint8_t *)ptr + soFar, size - soFar);
             if (res < 0)
                 panic("Read call failed! %s\n", strerror(errno));
             else
@@ -119,6 +120,6 @@ class NativeTrace : public ExeTracer
     check(NativeTraceRecord *record) = 0;
 };
 
-} /* namespace Trace */
+} // namespace Trace
 
 #endif // __CPU_NATIVETRACE_HH__