X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgethrxtime.c;h=84367466240d510018a52ea43d52e6d5c80081b5;hb=fba7fdb1432af9bf0abece1ec8078ed8ae3af886;hp=2c985789dcfd49e191250014c51faa037b5084b5;hpb=6ef9a07334fff72a0f4ae8e548c303fdcc27eee8;p=gnulib.git
diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c
index 2c985789d..843674662 100644
--- a/lib/gethrxtime.c
+++ b/lib/gethrxtime.c
@@ -1,11 +1,11 @@
/* gethrxtime -- get high resolution real time
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,31 +13,21 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "gethrxtime.h"
-#include
-#if TIME_WITH_SYS_TIME
-# include
-# include
-#else
-# if HAVE_SYS_TIME_H
-# include
-# else
-# include
-# endif
-#endif
+#include
+#include "timespec.h"
-/* Get the time of a high-resolution clock, preferably one that is not
- subject to resetting or drifting. */
+/* Get the current time, as a count of the number of nanoseconds since
+ an arbitrary epoch (e.g., the system boot time). Prefer a
+ high-resolution clock that is not subject to resetting or
+ drifting. */
xtime_t
gethrxtime (void)
@@ -65,16 +55,14 @@ gethrxtime (void)
return xtime_make (tv.tv_sec, 1000 * tv.tv_usec);
}
+# else
/* No monotonically increasing clocks are available; fall back on a
clock that might jump backwards, since it's the best we can do. */
-# elif HAVE_GETTIMEOFDAY && XTIME_PRECISION != 1
{
- struct timeval tv;
- gettimeofday (&tv, NULL);
- return xtime_make (tv.tv_sec, 1000 * tv.tv_usec);
+ struct timespec ts;
+ gettime (&ts);
+ return xtime_make (ts.tv_sec, ts.tv_nsec);
}
-# else
- return xtime_make (time (NULL), 0);
# endif
#endif
}