Implements the 'times' builtin (#580)

Uses os.times() underneath, which uses floating point objects

bin/oil.py

@@ -446,6 +446,7 @@ def ShellMain(lang, argv0, argv, login_shell):
       builtin_e.DIRS: builtin.Dirs(mem, dir_stack, errfmt),
       builtin_e.PWD: builtin.Pwd(mem, errfmt),
 
+      builtin_e.TIMES: builtin.Times(),
       builtin_e.READ: builtin.Read(splitter, mem),
       builtin_e.HELP: builtin.Help(loader, errfmt),
       builtin_e.HISTORY: builtin.History(line_input),

osh/builtin.py

@@ -41,6 +41,8 @@
 import libc
 import posix_ as posix
 
+import os
+
 from mycpp import mylib
 if mylib.PYTHON:
   # Hack because we don't want libcmark.so dependency for build/dev.sh minimal
@@ -67,7 +69,7 @@
 
     "set": builtin_e.SET,
     "shift": builtin_e.SHIFT,
-    #"times": builtin_e.TIMES,  # no implemented
+    "times": builtin_e.TIMES,
     "trap": builtin_e.TRAP,
     "unset": builtin_e.UNSET,
 
@@ -277,6 +279,17 @@ def _AppendParts(s, spans, max_results, join_next, parts):
   return done, join_next
 
 
+TIMES_SPEC = _Register('times')
+
+class Times(object):
+  def __call__(self, arg_vec):
+    utime, stime, cutime, cstime, elapsed = os.times()
+    print("%dm%1.3fs %dm%1.3fs" % (utime / 60, utime % 60, stime / 60, stime % 60))
+    print("%dm%1.3fs %dm%1.3fs" % (cutime / 60, cutime % 60, cstime / 60, cstime % 60))
+
+    return 0
+
+
 READ_SPEC = _Register('read')
 READ_SPEC.ShortFlag('-r')
 READ_SPEC.ShortFlag('-n', args.Int)

osh/runtime.asdl

@@ -3,7 +3,7 @@
 module runtime
 {
   builtin = 
-    NONE | READ | ECHO | PRINTF | SHIFT
+    NONE | TIMES | READ | ECHO | PRINTF | SHIFT
   | CD | PWD | PUSHD | POPD | DIRS
   | EXPORT | READONLY | LOCAL | DECLARE | TYPESET 
   | UNSET | SET | SHOPT

spec/builtin-times.test.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#### `times` yields two formatted lines
+output=$(times)
+echo "$output" | while read line
+do
+	echo "$line" | egrep -q '[0-9]+m[0-9]+.[0-9]{3}s [0-9]+m[0-9]+.[0-9]{3}s' && echo "pass"
+done
+
+echo "$output" | wc -l
+## status: 0
+## STDOUT:
+pass
+pass
+2
+## END

test/spec.sh

@@ -428,6 +428,10 @@ builtin-special() {
     ${REF_SHELLS[@]} $ZSH $OSH_LIST "$@"
 }
 
+builtin-times() {
+  sh-spec spec/builtin-times.test.sh $BASH $ZSH $OSH_LIST "$@"
+}
+
 command-parsing() {
   sh-spec spec/command-parsing.test.sh ${REF_SHELLS[@]} $OSH_LIST "$@"
 }