Merge pull request #21963 from harlanhaskins/throw-it-at-the-wall-and-see-what-sticks

[utils] Add wall time to rusage

Author: Harlan Haskins

utils/rusage.py

@@ -36,6 +36,7 @@
 import resource
 import subprocess
 import sys
+import time
 
 
 class MemAction(argparse.Action):
@@ -79,6 +80,9 @@ def __call__(self, parser, namespace, v, option_string=None):
                     metavar="T",
                     help="time (in secs, or ..'ms', 'us')",
                     action=TimeAction)
+parser.add_argument("--wall-time",
+                    help="wall time (in secs, or ..'ms', 'us')",
+                    action='store_true')
 parser.add_argument("--enforce",
                     action='store_true',
                     default=False,
@@ -125,7 +129,13 @@ def __call__(self, parser, namespace, v, option_string=None):
             sys.stderr.write("rusage: setrlimit(RLIMIT_RSS, %d)\n"
                              % mem)
         resource.setrlimit(resource.RLIMIT_RSS, (mem, mem))
+
+start = time.time()
 ret = subprocess.call(args.remainder)
+end = time.time()
+
+wall_time = end - start
+
 used = resource.getrusage(resource.RUSAGE_CHILDREN)
 
 if args.verbose:
@@ -144,18 +154,27 @@ def __call__(self, parser, namespace, v, option_string=None):
 if args.verbose or over_time:
     sys.stderr.write("rusage: subprocess time: %.6f secs\n"
                      % used.ru_utime)
+    if args.wall_time:
+        sys.stderr.write("rusage: subprocess wall time: %.6f secs\n"
+                         % wall_time)
 if over_time:
     sys.stderr.write("rusage:  exceeded limit: %.6f secs\n"
                      % args.time)
 
 if args.csv:
     fieldnames = ["time", "mem", "run"]
+    row = {
+        'time': used.ru_utime,
+        'mem': used.ru_maxrss,
+        'run': args.csv_name
+    }
+    if args.wall_time:
+        row['wall'] = wall_time
+        fieldnames.insert(1, 'wall')
     out = csv.DictWriter(args.csv_output, fieldnames, dialect='excel-tab')
     if args.csv_header:
         out.writeheader()
-    out.writerow(dict(time=used.ru_utime,
-                      mem=used.ru_maxrss,
-                      run=args.csv_name))
+    out.writerow(row)
 
 if over_mem or over_time:
     sys.exit(-1)