Support higher-resolution time stamps.

Fixes: debbugs:9000

3 files changed, 26 insertions, 21 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 68a8c37c2fb..11f68cebf14 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,13 @@
+2012-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Support higher-resolution time stamps (Bug#9000).
+        * Makefile.in (LIB_CLOCK_GETTIME): New macro.
+        (profile${EXEEXT}): Use it.
+        * profile.c: Include inttyeps.h, intprops.h.
+        (time_string): Size conservatively; do not guess size.
+        (get_time): Now prints nanoseconds.
+        (gettimeofday): Remove replacement function; gnulib now does this.
+
 2012-06-08  Andreas Schwab  <schwab@linux-m68k.org>
 
         * make-docfile.c (search_lisp_doc_at_eol): Unget last read
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 2df22d9f7d8..a325fc18aac 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -159,6 +159,8 @@ LIBHESIOD=@LIBHESIOD@
 LIBRESOLV=@LIBRESOLV@
 ## -llockfile if HAVE_LIBLOCKFILE or -lmail if HAVE_LIBMAIL
 LIBS_MAIL=@LIBS_MAIL@
+## empty or -lrt or -lposix4 if HAVE_CLOCK_GETTIME
+LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@
 
 ## Extra libraries to use when linking movemail.
 LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
@@ -309,7 +311,8 @@ ctags${EXEEXT}: etags${EXEEXT}
           regex.o $(LOADLIBES) -o ctags
 
 profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
-        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
+        $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \
+          $(LOADLIBES) $(LIB_CLOCK_GETTIME) -o profile
 
 make-docfile${EXEEXT}: ${srcdir}/make-docfile.c ../src/config.h
         $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 8ed4f318974..3e642237c6b 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -29,12 +29,17 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  **  operations: reset_watch, get_time
  */
 #include <config.h>
+
+#include <inttypes.h>
 #include <stdio.h>
+
+#include <intprops.h>
 #include <systime.h>
 
 static EMACS_TIME TV1, TV2;
 static int watch_not_started = 1; /* flag */
-static char time_string[30];
+static char time_string[INT_STRLEN_BOUND (uintmax_t) + sizeof "."
+                        + LOG10_EMACS_TIME_RESOLUTION];
 
 /* Reset the stopwatch to zero.  */
 
@@ -46,36 +51,23 @@ reset_watch (void)
 }
 
 /* This call returns the time since the last reset_watch call.  The time
-   is returned as a string with the format  <seconds>.<micro-seconds>
+   is returned as a string with the format  <seconds>.<nanoseconds>
    If reset_watch was not called yet, exit.  */
 
 static char *
 get_time (void)
 {
+  uintmax_t s;
+  int ns;
   if (watch_not_started)
     exit (EXIT_FAILURE);  /* call reset_watch first ! */
   EMACS_GET_TIME (TV2);
   EMACS_SUB_TIME (TV2, TV2, TV1);
-  sprintf (time_string, "%lu.%06lu", (unsigned long)EMACS_SECS (TV2), (unsigned long)EMACS_USECS (TV2));
+  s = EMACS_SECS (TV2);
+  ns = EMACS_NSECS (TV2);
+  sprintf (time_string, "%"PRIuMAX".%0*d", s, LOG10_EMACS_TIME_RESOLUTION, ns);
   return time_string;
 }
-
-#if ! defined (HAVE_GETTIMEOFDAY) && defined (HAVE_TIMEVAL)
-
-/* ARGSUSED */
-gettimeofday (tp, tzp)
-     struct timeval *tp;
-     struct timezone *tzp;
-{
-  extern long time ();
-
-  tp->tv_sec = time ((long *)0);
-  tp->tv_usec = 0;
-  if (tzp != 0)
-    tzp->tz_minuteswest = -1;
-}
-
-#endif
 
 int
 main (void)