EMACS_TIME simplification (Bug#11875).

This replaces macros (which typically do not work in GDB)
with functions, typedefs and enums, making the code easier to debug.
The functional style also makes code easier to read and maintain.
* lib-src/profile.c (TV2): Remove no-longer-needed static var.
* src/systime.h: Include <sys/time.h> on all hosts, not just if
WINDOWSNT, since 'struct timeval' is needed in general.
(EMACS_TIME): Now a typedef, not a macro.
(EMACS_TIME_RESOLUTION, LOG10_EMACS_TIME_RESOLUTION): Now constants,
not macros.
(EMACS_SECS, EMACS_NSECS, EMACS_TIME_SIGN, EMACS_TIME_VALID_P)
(EMACS_TIME_FROM_DOUBLE, EMACS_TIME_TO_DOUBLE, EMACS_TIME_EQ)
(EMACS_TIME_NE, EMACS_TIME_GT, EMACS_TIME_GE, EMACS_TIME_LT)
(EMACS_TIME_LE): Now functions, not macros.
(EMACS_SET_SECS, EMACS_SET_NSECS, EMACS_SET_SECS_NSECS)
(EMACS_SET_USECS, EMACS_SET_SECS_USECS): Remove these macros,
which are not functions.  All uses rewritten to use:
(make_emacs_time): New function.
(EMACS_SECS_ADDR, EMACS_SET_INVALID_TIME, EMACS_GET_TIME)
(EMACS_ADD_TIME, EMACS_SUB_TIME): Remove these macros, which are
not functions.  All uses rewritten to use the following, respectively:
(emacs_secs_addr, invalid_emacs_time, get_emacs_time)
(add_emacs_time, sub_emacs_time): New functions.
* src/atimer.c: Don't include <sys/time.h>,	as "systime.h" does this.
* src/fileio.c (Fcopy_file):
* src/xterm.c (XTflash): Get the current time closer to when it's used.
* src/makefile.w32-in ($(BLD)/atimer.$(O)): Update dependencies.

1 files changed, 19 insertions, 22 deletions

diff --git a/src/process.c b/src/process.c
index 79100eb7a2c..98a47eca7ae 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1851,10 +1851,9 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
          So have an interrupt jar it loose.  */
       {
         struct atimer *timer;
-        EMACS_TIME offset;
+        EMACS_TIME offset = make_emacs_time (1, 0);
 
         stop_polling ();
-        EMACS_SET_SECS_USECS (offset, 1, 0);
         timer = start_atimer (ATIMER_RELATIVE, offset, create_process_1, 0);
 
         if (forkin >= 0)
@@ -4311,9 +4310,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
      compute the absolute time to return at.  */
   if (time_limit || 0 < nsecs)
     {
-      EMACS_GET_TIME (end_time);
-      EMACS_SET_SECS_NSECS (timeout, time_limit, nsecs);
-      EMACS_ADD_TIME (end_time, end_time, timeout);
+      timeout = make_emacs_time (time_limit, nsecs);
+      end_time = add_emacs_time (current_emacs_time (), timeout);
     }
 
   while (1)
@@ -4342,18 +4340,18 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
              gobble output available now
              but don't wait at all. */
 
-          EMACS_SET_SECS_USECS (timeout, 0, 0);
+          timeout = make_emacs_time (0, 0);
         }
       else if (time_limit || 0 < nsecs)
         {
-          EMACS_GET_TIME (timeout);
-          if (EMACS_TIME_LE (end_time, timeout))
+          EMACS_TIME now = current_emacs_time ();
+          if (EMACS_TIME_LE (end_time, now))
             break;
-          EMACS_SUB_TIME (timeout, end_time, timeout);
+          timeout = sub_emacs_time (end_time, now);
         }
       else
         {
-          EMACS_SET_SECS_USECS (timeout, 100000, 0);
+          timeout = make_emacs_time (100000, 0);
         }
 
       /* Normally we run timers here.
@@ -4438,7 +4436,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
             Atemp = input_wait_mask;
           Ctemp = write_mask;
 
-          EMACS_SET_SECS_USECS (timeout, 0, 0);
+          timeout = make_emacs_time (0, 0);
           if ((pselect (max (max_process_desc, max_input_desc) + 1,
                         &Atemp,
 #ifdef NON_BLOCKING_CONNECT
@@ -4590,7 +4588,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
                         nsecs = XPROCESS (proc)->read_output_delay;
                     }
                 }
-              EMACS_SET_SECS_NSECS (timeout, 0, nsecs);
+              timeout = make_emacs_time (0, nsecs);
               process_output_skip = 0;
             }
 #endif
@@ -6426,7 +6424,7 @@ sigchld_handler (int signo)
           /* Tell wait_reading_process_output that it needs to wake up and
              look around.  */
           if (input_available_clear_time)
-            EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
+            *input_available_clear_time = make_emacs_time (0, 0);
         }
 
       /* There was no asynchronous process found for that pid: we have
@@ -6444,7 +6442,7 @@ sigchld_handler (int signo)
           /* Tell wait_reading_process_output that it needs to wake up and
              look around.  */
           if (input_available_clear_time)
-            EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
+            *input_available_clear_time = make_emacs_time (0, 0);
         }
 
     sigchld_end_of_loop:
@@ -6857,9 +6855,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
   /* What does time_limit really mean?  */
   if (time_limit || 0 < nsecs)
     {
-      EMACS_GET_TIME (end_time);
-      EMACS_SET_SECS_NSECS (timeout, time_limit, nsecs);
-      EMACS_ADD_TIME (end_time, end_time, timeout);
+      timeout = make_emacs_time (time_limit, nsecs);
+      end_time = add_emacs_time (current_emacs_time (), timeout);
     }
 
   /* Turn off periodic alarms (in case they are in use)
@@ -6892,18 +6889,18 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
              gobble output available now
              but don't wait at all. */
 
-          EMACS_SET_SECS_USECS (timeout, 0, 0);
+          timeout = make_emacs_time (0, 0);
         }
       else if (time_limit || 0 < nsecs)
         {
-          EMACS_GET_TIME (timeout);
-          if (EMACS_TIME_LE (end_time, timeout))
+          EMACS_TIME now = current_emacs_time ();
+          if (EMACS_TIME_LE (end_time, now))
             break;
-          EMACS_SUB_TIME (timeout, end_time, timeout);
+          timeout = sub_emacs_time (end_time, now);
         }
       else
         {
-          EMACS_SET_SECS_USECS (timeout, 100000, 0);
+          timeout = make_emacs_time (100000, 0);
         }
 
       /* If our caller will not immediately handle keyboard events,