Accept zero valued bitmasks.

[apitrace] / os_posix.cpp

diff --git a/os_posix.cpp b/os_posix.cpp
index 3f423fe99cd1e01d3f8b7312e6590fbe37981f52..4c16096de0d38f052fca40881b494dd7516b5069 100644 (file)
--- a/os_posix.cpp
+++ b/os_posix.cpp
@@ -25,12 +25,13 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
+
+#include <unistd.h>
+#include <sys/time.h>
 #include <pthread.h>
 
 #include "os.hpp"
-#include "log.hpp"
 
 namespace OS {
 
@@ -59,7 +60,7 @@ GetProcessName(char *str, size_t size)
     ssize_t len;
     char szProcessPath[PATH_MAX + 1];
     char *lpProcessName;
-    
+
     // http://stackoverflow.com/questions/1023306/finding-current-executables-path-without-proc-self-exe
     len = readlink("/proc/self/exe", szProcessPath, sizeof(szProcessPath) - 1);
     if (len == -1) {
@@ -88,10 +89,20 @@ GetCurrentDir(char *str, size_t size)
 }
 
 void
-DebugMessage(const char *message)
+DebugMessage(const char *format, ...)
 {
-   fflush(stdout);
-   fputs(message, stderr);
+    va_list ap;
+    va_start(ap, format);
+    fflush(stdout);
+    vfprintf(stderr, format, ap);
+    va_end(ap);
+}
+
+long long GetTime(void)
+{
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return tv.tv_usec + tv.tv_sec*1000000LL;
 }
 
 void
@@ -103,8 +114,3 @@ Abort(void)
 
 } /* namespace OS */
 
-static void _uninit(void) __attribute__((destructor));
-static void _uninit(void) {
-    Log::Close();
-}
-