Changes in lemon/time_measure.h [562:b9b3473327e3:556:c5919679af17] in lemon

File:

• lemon/time_measure.h (modified) (2 diffs)

lemon/time_measure.h

@@ -25 +25 @@
 
 #ifdef WIN32
-#include <lemon/bits/windows.h>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#include <cmath>
 #else
 #include <unistd.h>
@@ -86 +93 @@
       cstime=ts.tms_cstime/tck;
 #else
-      bits::getWinProcTimes(rtime, utime, stime, cutime, cstime);
+      static const double ch = 4294967296.0e-7;
+      static const double cl = 1.0e-7;
+
+      FILETIME system;
+      GetSystemTimeAsFileTime(&system);
+      rtime = ch * system.dwHighDateTime + cl * system.dwLowDateTime;
+
+      FILETIME create, exit, kernel, user;
+      if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
+        utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime;
+        stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime;
+        cutime = 0;
+        cstime = 0;
+      } else {
+        rtime = 0;
+        utime = 0;
+        stime = 0;
+        cutime = 0;
+        cstime = 0;
+      }
 #endif
     }