Replace uses of TickDuration with MonoTime.

dlang · Jul 30, 2014 · d681cad · d681cad
1 parent 59a68b0
commit d681cad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/core/time.d b/src/core/time.d
@@ -119,13 +119,10 @@ ulong mach_absolute_time();
 
 }
 
-version(unittest)
+//To verify that an lvalue isn't required.
+version(unittest) T copy(T)(T t)
 {
-    //To verify that an lvalue isn't required.
-    T copy(T)(T t)
-    {
-        return t;
-    }
+    return t;
 }
 
 

diff --git a/src/gc/gc.d b/src/gc/gc.d
@@ -65,16 +65,18 @@ debug(PRINTF_TO_FILE)
 {
     import core.time;
 
-    private __gshared TickDuration gcStartTick;
+    private __gshared MonoTime gcStartTick;
     private __gshared FILE* gcx_fh;
 
     private int printf(ARGS...)(const char* fmt, ARGS args) nothrow
     {
-        if (gcStartTick == TickDuration.zero)
-            gcStartTick = TickDuration.currSystemTick;
+        if (gcStartTick == MonoTime.init)
+            gcStartTick = MonoTime.currTime;
         if (!gcx_fh)
             gcx_fh = fopen("gcx.log", "w");
-        int len = fprintf(gcx_fh, "%10.6lf: ", (TickDuration.currSystemTick - gcStartTick).to!("seconds", double));
+        immutable timeElapsed = MonoTime.currTime - gcStartTick;
+        immutable secondsAsDouble = diff.total!"hnsecs" / cast(double)convert!("seconds", "hnsecs")(1);
+        int len = fprintf(gcx_fh, "%10.6lf: ", secondsAsDouble);
         len += fprintf(gcx_fh, fmt, args);
         fflush(gcx_fh);
         return len;

diff --git a/src/test_runner.d b/src/test_runner.d
@@ -1,4 +1,4 @@
-import core.runtime, core.time : TickDuration;
+import core.runtime, core.time : MonoTime;
 import core.stdc.stdio;
 
 immutable(ModuleInfo*) getModuleInfo(string name)
@@ -22,10 +22,10 @@ bool tester()
     {
         try
         {
-            immutable t0 = TickDuration.currSystemTick;
+            immutable t0 = MonoTime.currTime;
             fp();
-            immutable t1 = TickDuration.currSystemTick;
-            printf("%.3fs PASS %.*s\n", (t1 - t0).msecs / 1000.,
+            immutable t1 = MonoTime.currTime;
+            printf("%.3fs PASS %.*s\n", (t1 - t0).total!"msecs" / 1000.0,
                 cast(int)name.length, name.ptr);
         }
         catch (Throwable e)