Utime + Systime used in place of gettimeofday.

[helm.git] / helm / software / components / binaries / utilities / test_library.ml

diff --git a/helm/software/components/binaries/utilities/test_library.ml b/helm/software/components/binaries/utilities/test_library.ml
index 635b6bbd4d40533834b15d03ca789e28740bc32d..98ade3adb54ad8a8e408d8771808efbb02a37d08 100644 (file)
--- a/helm/software/components/binaries/utilities/test_library.ml
+++ b/helm/software/components/binaries/utilities/test_library.ml
@@ -83,9 +83,14 @@ let _ =
         Printf.printf "%s " uri;
         flush stdout;
         let uri = UriManager.uri_of_string uri in
-        let before = Unix.gettimeofday () in
+        let obj,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
         ignore (Unix.alarm deadline);
-        ignore (CicTypeChecker.typecheck uri);
+        CicTypeChecker.typecheck_obj uri obj;
+        ignore (Unix.alarm 0);
+        CicEnvironment.remove_obj uri;
+        let before = Unix.times () in
+        ignore (Unix.alarm deadline);
+        ignore (CicTypeChecker.typecheck_obj uri obj);
         ignore (Unix.alarm 0);
         let memusage = (Gc.stat ()).Gc.live_words * 4 / 1024 / 1024 in
         if memusage > 500 then
@@ -96,8 +101,8 @@ let _ =
           let memusage = (Gc.stat ()).Gc.live_words * 4 / 1024 / 1024 in
             prerr_endline ("DOPO CicEnvironment.empty: " ^ string_of_int memusage ^ "Mb");
          end;
-        let after = Unix.gettimeofday () in
-        let diff = after -. before in
+        let after = Unix.times () in
+        let diff = after.Unix.tms_utime +. after.Unix.tms_stime -. before.Unix.tms_utime -. before.Unix.tms_stime in
         new_total := !new_total +. diff;
         Printf.printf "\e[0;32mOK\e[0m %.2f" diff;
         (match time with