X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgethrxtime.c;h=10d2ab98a47e2e0b961627158fbf020106ed1b76;hb=4a5ee89c8a8be7350a8fd8ca1bacb196a190e492;hp=6f7bc098c283bf22f4452be3cc801d5712e80d16;hpb=10ce26c08f4e8ffe6ac636b1fec6a33a847b0d3a;p=gnulib.git

diff --git a/lib/gethrxtime.c b/lib/gethrxtime.c
index 6f7bc098c..10d2ab98a 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-2007, 2009-2013 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,68 +13,61 @@
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
+#define GETHRXTIME_INLINE _GL_EXTERN_INLINE
 #include "gethrxtime.h"
 
-#include <sys/types.h>
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
+#if ! (HAVE_ARITHMETIC_HRTIME_T && HAVE_DECL_GETHRTIME)
 
-/* Get the time of a high-resolution clock, preferably one that is not
-   subject to resetting or drifting.  */
+#include <sys/time.h>
+#include "timespec.h"
+
+/* 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)
 {
-#if HAVE_NANOUPTIME
+# if HAVE_NANOUPTIME
   {
     struct timespec ts;
     nanouptime (&ts);
     return xtime_make (ts.tv_sec, ts.tv_nsec);
   }
-#else
+# else
 
-# if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
+#  if defined CLOCK_MONOTONIC && HAVE_CLOCK_GETTIME
   {
     struct timespec ts;
     if (clock_gettime (CLOCK_MONOTONIC, &ts) == 0)
       return xtime_make (ts.tv_sec, ts.tv_nsec);
   }
-# endif
+#  endif
 
-#if HAVE_MICROUPTIME
+#  if HAVE_MICROUPTIME
   {
     struct timeval tv;
     microuptime (&tv);
     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
-#endif
 }
+
+#endif