Re: [RFC] Millisecond and microsecond specifiers for TIMEFMT

[dana <dana@dana.is>]

On 13 Dec 2017, at 12:01, Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
>You don't need to fiddle with SECONDS beyond turning it into floating
>point...

Yeah, that's what i was referring to. It works OK, for what it is.

On 13 Dec 2017, at 12:01, Peter Stephenson <p.w.stephenson@ntlworld.com> wrote:
>Can't see any obvious problem with this.  Just needs documenting.

Added test and documentation then. I have absolutely no idea how to get yodl
built on macOS, so if someone has time to double-check my syntax that'd be nice.

Thanks!

dana


diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 5757111b2..bb5c8a54d 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -1616,10 +1616,12 @@ sitem(tt(%c))(Number of involuntary context switches.)
 sitem(tt(%J))(The name of this job.)
 endsitem()
 
-A star may be inserted between the percent sign and flags printing time.
-This cause the time to be printed in
+A star may be inserted between the percent sign and flags printing time
+(e.g., `tt(%*E)'); this causes the time to be printed in
 `var(hh)tt(:)var(mm)tt(:)var(ss)tt(.)var(ttt)'
 format (hours and minutes are only printed if they are not zero).
+Alternatively, `tt(m)' or `tt(u)' may be used (e.g., `tt(%mE)') to produce
+time output in milliseconds or microseconds, respectively.
 )
 vindex(TMOUT)
 item(tt(TMOUT))(
diff --git a/Src/jobs.c b/Src/jobs.c
index 226e7cff3..fc5bfacc6 100644
--- a/Src/jobs.c
+++ b/Src/jobs.c
@@ -728,6 +728,40 @@ printtime(struct timeval *real, child_times_t *ti, char *desc)
 	    case 'S':
 		fprintf(stderr, "%4.2fs", system_time);
 		break;
+	    case 'm':
+		switch (*++s) {
+		case 'E':
+		    fprintf(stderr, "%0.fms", elapsed_time * 1000.0);
+		    break;
+		case 'U':
+		    fprintf(stderr, "%0.fms", user_time * 1000.0);
+		    break;
+		case 'S':
+		    fprintf(stderr, "%0.fms", system_time * 1000.0);
+		    break;
+		default:
+		    fprintf(stderr, "%%m");
+		    s--;
+		    break;
+		}
+		break;
+	    case 'u':
+		switch (*++s) {
+		case 'E':
+		    fprintf(stderr, "%0.fus", elapsed_time * 1000000.0);
+		    break;
+		case 'U':
+		    fprintf(stderr, "%0.fus", user_time * 1000000.0);
+		    break;
+		case 'S':
+		    fprintf(stderr, "%0.fus", system_time * 1000000.0);
+		    break;
+		default:
+		    fprintf(stderr, "%%u");
+		    s--;
+		    break;
+		}
+		break;
 	    case '*':
 		switch (*++s) {
 		case 'E':
diff --git a/Test/A01grammar.ztst b/Test/A01grammar.ztst
index 5e7d6acd8..217f7bea4 100644
--- a/Test/A01grammar.ztst
+++ b/Test/A01grammar.ztst
@@ -369,6 +369,10 @@
   (time cat) >&/dev/null
 0:`time' keyword (status only)
 
+  TIMEFMT='%E %mE %uE %* %m%mm %u%uu'; time (:)
+0:`time' keyword with custom TIMEFMT
+*?[0-9]##.[0-9](#c2)s [0-9]##ms [0-9]##us %\* %m%mm %u%uu
+
   if [[ -f foo && -d . && -n $ZTST_testdir ]]; then
     true
   else