Merge from trunk.

[gnu-emacs] / lib-src / profile.c

diff --git a/lib-src/profile.c b/lib-src/profile.c
index 3e642237c6bf98da3d20b147f8f44ee823b63387..3489e4925435b3410cb8ccde69c1cc74ab65f043 100644 (file)
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /**
- **  To be run as an emacs process. Input string that starts with:
+ **  To be run as an emacs subprocess.  Input string that starts with:
  **    'z' -- resets the watch (to zero).
  **    'p' -- return time (on stdout) as string with format <sec>.<micro-sec>
  **    'q' -- exit.
@@ -30,13 +30,15 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
 #include <config.h>
 
+#define SYSTIME_INLINE EXTERN_INLINE
+
 #include <inttypes.h>
 #include <stdio.h>
 
 #include <intprops.h>
 #include <systime.h>
 
-static EMACS_TIME TV1, TV2;
+static EMACS_TIME TV1;
 static int watch_not_started = 1; /* flag */
 static char time_string[INT_STRLEN_BOUND (uintmax_t) + sizeof "."
                        + LOG10_EMACS_TIME_RESOLUTION];
@@ -46,7 +48,7 @@ static char time_string[INT_STRLEN_BOUND (uintmax_t) + sizeof "."
 static void
 reset_watch (void)
 {
-  EMACS_GET_TIME (TV1);
+  TV1 = current_emacs_time ();
   watch_not_started = 0;
 }
 
@@ -57,14 +59,11 @@ reset_watch (void)
 static char *
 get_time (void)
 {
-  uintmax_t s;
-  int ns;
+  EMACS_TIME TV2 = sub_emacs_time (current_emacs_time (), TV1);
+  uintmax_t s = EMACS_SECS (TV2);
+  int ns = EMACS_NSECS (TV2);
   if (watch_not_started)
     exit (EXIT_FAILURE);  /* call reset_watch first ! */
-  EMACS_GET_TIME (TV2);
-  EMACS_SUB_TIME (TV2, TV2, TV1);
-  s = EMACS_SECS (TV2);
-  ns = EMACS_NSECS (TV2);
   sprintf (time_string, "%"PRIuMAX".%0*d", s, LOG10_EMACS_TIME_RESOLUTION, ns);
   return time_string;
 }