Use libast tvgettime() for better portability

This replaces usage of the obsolescent timeofday() macro with the
more portable tvgettime() function in libast, which itself uses
the modern clock_gettime internally.

This commit uses C99 variable declarations unabashedly for
better struct initialization; no need to keep up a false C89 pretense
anymore.

Author: JohnoKing

src/cmd/ksh93/Mamfile

@@ -347,6 +347,7 @@ make install virtual
 			prev include/shlex.h
 			prev include/fcin.h
 			prev include/builtins.h
+			prev %{INCLUDE_AST}/tv.h
 			prev %{INCLUDE_AST}/tmx.h
 			prev %{INCLUDE_AST}/error.h
 			prev include/defs.h
@@ -695,6 +696,7 @@ make install virtual
 			prev include/variables.h
 			prev %{INCLUDE_AST}/ast_random.h
 			prev %{INCLUDE_AST}/regex.h
+			prev %{INCLUDE_AST}/tv.h
 			prev %{INCLUDE_AST}/tmx.h
 			prev include/defs.h
 			prev shopt.h
@@ -841,6 +843,7 @@ make install virtual
 			prev %{INCLUDE_AST}/error.h
 			prev %{INCLUDE_AST}/sig.h
 			prev %{INCLUDE_AST}/ast.h
+			prev %{INCLUDE_AST}/tv.h
 			prev shopt.h
 		done
 
@@ -872,6 +875,7 @@ make install virtual
 			prev include/variables.h
 			prev include/fcin.h
 			prev include/defs.h
+			prev %{INCLUDE_AST}/tv.h
 			prev shopt.h
 		done
 

src/cmd/ksh93/bltins/alarm.c

@@ -27,6 +27,7 @@
 #include	"defs.h"
 #include	<error.h>
 #include	<tmx.h>
+#include	<tv.h>
 #include	"builtins.h"
 #include	"fcin.h"
 #include	"shlex.h"
@@ -96,9 +97,9 @@ static 	void *time_delete(struct tevent *item, void *list)
 
 static Time_t getnow(void)
 {
-	struct timeval tmp;
-	timeofday(&tmp);
-	return tmp.tv_sec + 1.e-6 * tmp.tv_usec;
+	Tv_t tmp;
+	tvgettime(&tmp);
+	return tmp.tv_sec + 1.e-9 * tmp.tv_nsec;
 }
 
 static void	print_alarms(void *list)

src/cmd/ksh93/features/time

@@ -1,38 +1,10 @@
 hdr	utime,sys/resource
-lib	getrusage,gettimeofday,setitimer
-mem	timeval.tv_usec sys/time.h
-tst	lib_2_timeofday note{ 2 arg gettimeofday() }end link{
-	#include <sys/types.h>
-	#include <sys/time.h>
-	int main(void)
-	{
-		struct timeval tv;
-		struct timezone tz;
-		return gettimeofday(&tv, &tz);
-	}
-}end
-tst	lib_1_timeofday note{ 1 arg gettimeofday() }end link{
-	#include <sys/types.h>
-	#include <sys/time.h>
-	int main(void)
-	{
-		struct timeval tv;
-		return gettimeofday(&tv);
-	}
-}end
+lib	getrusage,setitimer
 cat{
 	#undef _def_time
 	#include	<times.h>
 	#include	<sys/time.h>
 	#define _def_time	1
-	#undef timeofday
-	#if _lib_2_timeofday
-	#define timeofday(p)	gettimeofday(p,NULL)
-	#else
-	#if _lib_1_timeofday
-	#define timeofday(p)	gettimeofday(p)
-	#endif
-	#endif
 	/* BSD timeradd and timersub macros */
 	#if !defined(timeradd)
 	#define	timeradd(tvp, uvp, vvp)						\

src/cmd/ksh93/sh/init.c

@@ -32,6 +32,7 @@
 #include        "defs.h"
 #include        <pwd.h>
 #include        <tmx.h>
+#include        <tv.h>
 #include        <regex.h>
 #include	<math.h>
 #include	<ast_random.h>
@@ -553,14 +554,13 @@ static char* get_ifs(Namval_t *np, Namfun_t *fp)
 /*
  * these functions are used to get and set the SECONDS variable
  */
-#define dtime(tp) ((double)((tp)->tv_sec)+1e-6*((double)((tp)->tv_usec)))
-#define tms	timeval
+#define dtime(tp) ((double)((tp)->tv_sec)+1e-9*((double)((tp)->tv_nsec)))
 
 static void put_seconds(Namval_t* np,const char *val,nvflag_t flags,Namfun_t *fp)
 {
 	double d;
 	double *dp = np->nvalue;
-	struct tms tp;
+	Tv_t tp;
 	if(!val)
 	{
 		nv_putv(np, val, flags, fp);
@@ -577,31 +577,31 @@ static void put_seconds(Namval_t* np,const char *val,nvflag_t flags,Namfun_t *fp
 	}
 	nv_putv(np, val, flags, fp);
 	d = *dp;
-	timeofday(&tp);
+	tvgettime(&tp);
 	*dp = dtime(&tp)-d;
 }
 
 static char* get_seconds(Namval_t *np, Namfun_t *fp)
 {
 	size_t places = nv_size(np);
-	struct tms tp;
+	Tv_t tp;
 	double d;
 	double *dp = np->nvalue;
 	double offset = dp ? *dp : 0;
 	NOT_USED(fp);
-	timeofday(&tp);
+	tvgettime(&tp);
 	d = dtime(&tp)- offset;
 	sfprintf(sh.strbuf,"%.*f",places,d);
 	return sfstruse(sh.strbuf);
 }
 
 static Sfdouble_t nget_seconds(Namval_t *np, Namfun_t *fp)
 {
-	struct tms tp;
+	Tv_t tp;
 	double *dp = np->nvalue;
 	double offset = dp ? *dp : 0;
 	NOT_USED(fp);
-	timeofday(&tp);
+	tvgettime(&tp);
 	return dtime(&tp) - offset;
 }
 

src/cmd/ksh93/sh/timers.c

@@ -20,6 +20,7 @@
 #include	<ast.h>
 #include	<sig.h>
 #include	<error.h>
+#include	<tv.h>
 #include	"fault.h"
 #include	"defs.h"
 #include	"FEATURE/time"
@@ -44,9 +45,9 @@ static char time_state;
 static Sfdouble_t getnow(void)
 {
 	Sfdouble_t now;
-	struct timeval tp;
-	timeofday(&tp);
-	now = tp.tv_sec + 1.e-6*tp.tv_usec;
+	Tv_t tp;
+	tvgettime(&tp);
+	now = tp.tv_sec + 1.e-6*(tp.tv_nsec/1000);
 	return now+.001;
 }
 

src/cmd/ksh93/sh/xec.c

@@ -35,6 +35,7 @@
 #include	"jobs.h"
 #include	"test.h"
 #include	"builtins.h"
+#include	<tv.h>
 #include	"FEATURE/time"
 #include	"FEATURE/externs"
 #include	"FEATURE/locale"
@@ -2240,7 +2241,7 @@ int sh_exec(const Shnode_t *t, int flags)
 		    case TTIME:
 		    {
 			const char *format = e_timeformat;
-			struct timeval ta, tb;
+			Tv_t tva, tvb;
 			struct timeval before_usr, before_sys, after_usr, after_sys, tm[3];
 			if(type!=TTIME)
 			{
@@ -2252,7 +2253,7 @@ int sh_exec(const Shnode_t *t, int flags)
 			{
 				int timer_on = sh_isstate(SH_TIMING);
 				/* must be run after forking a subshell */
-				timeofday(&tb);
+				tvgettime(&tvb);
 				get_cpu_times(&before_usr, &before_sys);
 				sh_onstate(SH_TIMING);
 				sh_exec(t->par.partre,sh_isstate(SH_ERREXIT)|(flags & ARG_OPTIMIZE));
@@ -2265,7 +2266,9 @@ int sh_exec(const Shnode_t *t, int flags)
 				before_sys.tv_sec = before_sys.tv_usec = 0;
 			}
 			get_cpu_times(&after_usr, &after_sys);
-			timeofday(&ta);
+			tvgettime(&tva);
+			struct timeval ta = { .tv_sec = tva.tv_sec, .tv_usec = (suseconds_t)(tva.tv_nsec / 1000) };
+			struct timeval tb = { .tv_sec = tvb.tv_sec, .tv_usec = (suseconds_t)(tvb.tv_nsec / 1000) };
 			timersub(&ta, &tb, &tm[TM_REAL_IDX]); /* calculate elapsed real-time */
 			timersub(&after_usr, &before_usr, &tm[TM_USR_IDX]);
 			timersub(&after_sys, &before_sys, &tm[TM_SYS_IDX]);