projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Doxygen frindly comments
[yaz-moved-to-github.git]
/
src
/
timing.c
diff --git
a/src/timing.c
b/src/timing.c
index
0486eb8
..
7a0b0b1
100644
(file)
--- 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) 1995-2009 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: timing.c,v 1.4 2007-01-05 14:05:24 adam Exp $
*/
/**
*/
/**
@@
-36,18
+34,19
@@
struct yaz_timing {
#endif
#if HAVE_SYS_TIME_H
struct timeval start_time, end_time;
#endif
#if HAVE_SYS_TIME_H
struct timeval start_time, end_time;
-#endif
+#else
#ifdef WIN32
#ifdef WIN32
- ULONGLONG start_time, end_time;
- ULONGLONG start_time_sys, start_time_user;
- ULONGLONG end_time_sys, end_time_user;
+ 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)
{
#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;
}
yaz_timing_start(t);
return t;
}
@@
-67,7
+66,7
@@
static void get_process_time(ULONGLONG *lp_user, ULONGLONG *lp_sys)
li.HighPart = sys_t.dwHighDateTime;
*lp_sys = li.QuadPart;
}
li.HighPart = sys_t.dwHighDateTime;
*lp_sys = li.QuadPart;
}
-static void get_date_as_largeinteger(ULONGLONG *lp)
+static void get_date_as_largeinteger(LONGLONG *lp)
{
FILETIME f;
ULARGE_INTEGER li;
{
FILETIME f;
ULARGE_INTEGER li;
@@
-93,7
+92,7
@@
void yaz_timing_start(yaz_timing_t t)
#if HAVE_SYS_TIME_H
gettimeofday(&t->start_time, 0);
t->real_sec = 0.0;
#if HAVE_SYS_TIME_H
gettimeofday(&t->start_time, 0);
t->real_sec = 0.0;
-#endif
+#else
#ifdef WIN32
t->real_sec = 0.0;
t->user_sec = 0.0;
#ifdef WIN32
t->real_sec = 0.0;
t->user_sec = 0.0;
@@
-101,6
+100,7
@@
void yaz_timing_start(yaz_timing_t t)
get_date_as_largeinteger(&t->start_time);
get_process_time(&t->start_time_user, &t->start_time_sys);
#endif
get_date_as_largeinteger(&t->start_time);
get_process_time(&t->start_time_user, &t->start_time_sys);
#endif
+#endif
}
void yaz_timing_stop(yaz_timing_t t)
}
void yaz_timing_stop(yaz_timing_t t)
@@
-115,8
+115,7
@@
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;
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 = (t->end_time - t->start_time) / 10000000.0;
#ifdef WIN32
get_date_as_largeinteger(&t->end_time);
t->real_sec = (t->end_time - t->start_time) / 10000000.0;
@@
-125,6
+124,7
@@
void yaz_timing_stop(yaz_timing_t t)
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
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
}
double yaz_timing_get_real(yaz_timing_t t)
}
double yaz_timing_get_real(yaz_timing_t t)
@@
-154,6
+154,7
@@
void yaz_timing_destroy(yaz_timing_t *tp)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab