X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftiming.c;h=df43a4122b2e37e28d15714f30049d1151bddde9;hp=0276d0749e393384ab300c6034a7c0cb2b9c4915;hb=236966a07ceb8e28649470995f88251c37423715;hpb=e1000eb6be4e847ac7d1099c5b919a0732276a9a

diff --git a/src/timing.c b/src/timing.c
index 0276d07..df43a41 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: timing.c,v 1.3 2007-01-05 12:40:05 adam Exp $
  */
 
 /**
@@ -36,22 +34,39 @@ struct yaz_timing {
 #endif
 #if HAVE_SYS_TIME_H
     struct timeval start_time, end_time;
-#endif
+#else
 #ifdef WIN32
-    ULONGLONG start_time, end_time;
+    LONGLONG start_time, end_time;
+    LONGLONG start_time_sys, start_time_user;
+    LONGLONG end_time_sys, end_time_user;
+#endif
 #endif
     double real_sec, user_sec, sys_sec;
 };
 
 yaz_timing_t yaz_timing_create(void)
 {
-    yaz_timing_t t = xmalloc(sizeof(*t));
+    yaz_timing_t t = (yaz_timing_t) xmalloc(sizeof(*t));
     yaz_timing_start(t);
     return t;
 }
 
 #ifdef WIN32
-static void get_date_as_largeinteger(ULONGLONG *lp)
+static void get_process_time(ULONGLONG *lp_user, ULONGLONG *lp_sys)
+{
+    FILETIME create_t, exit_t, sys_t, user_t;
+    ULARGE_INTEGER li;
+
+    GetProcessTimes(GetCurrentProcess(), &create_t, &exit_t, &sys_t, &user_t);
+    li.LowPart = user_t.dwLowDateTime;
+    li.HighPart = user_t.dwHighDateTime;
+    *lp_user = li.QuadPart;
+
+    li.LowPart = sys_t.dwLowDateTime;
+    li.HighPart = sys_t.dwHighDateTime;
+    *lp_sys = li.QuadPart;
+}
+static void get_date_as_largeinteger(LONGLONG *lp)
 {
     FILETIME f;
     ULARGE_INTEGER li;
@@ -77,10 +92,14 @@ void yaz_timing_start(yaz_timing_t t)
 #if HAVE_SYS_TIME_H
     gettimeofday(&t->start_time, 0);
     t->real_sec = 0.0;
-#endif
+#else
 #ifdef WIN32
-    get_date_as_largeinteger(&t->start_time);
     t->real_sec = 0.0;
+    t->user_sec = 0.0;
+    t->sys_sec = 0.0;
+    get_date_as_largeinteger(&t->start_time);
+    get_process_time(&t->start_time_user, &t->start_time_sys);
+#endif
 #endif
 }
 
@@ -88,7 +107,7 @@ void yaz_timing_stop(yaz_timing_t t)
 {
 #if HAVE_SYS_TIMES_H
     times(&t->tms2);
-    
+
     t->user_sec = (double) (t->tms2.tms_utime - t->tms1.tms_utime)/100;
     t->sys_sec = (double) (t->tms2.tms_stime - t->tms1.tms_stime)/100;
 #endif
@@ -96,11 +115,15 @@ void yaz_timing_stop(yaz_timing_t t)
     gettimeofday(&t->end_time, 0);
     t->real_sec = ((t->end_time.tv_sec - t->start_time.tv_sec) * 1000000.0 +
                    t->end_time.tv_usec - t->start_time.tv_usec) / 1000000;
-    
-#endif
+#else
 #ifdef WIN32
     get_date_as_largeinteger(&t->end_time);
-    t->real_sec = (double) (t->end_time - t->start_time) / 10000000.0;
+    t->real_sec = (t->end_time - t->start_time) / 10000000.0;
+
+    get_process_time(&t->end_time_user, &t->end_time_sys);
+    t->user_sec = (t->end_time_user - t->start_time_user) / 10000000.0;
+    t->sys_sec = (t->end_time_sys - t->start_time_sys) / 10000000.0;
+#endif
 #endif
 }
 
@@ -131,6 +154,7 @@ void yaz_timing_destroy(yaz_timing_t *tp)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab