parse times relative to first parsed second

robgjansen · robgjansen · commit b5024bb36680 · 2018-04-02T13:07:19.000-04:00
diff --git a/tools/parse-torctl.py b/tools/parse-torctl.py
@@ -37,19 +37,19 @@
 
 def main():
     parser = argparse.ArgumentParser(
-        description=DESCRIPTION, 
+        description=DESCRIPTION,
         formatter_class=argparse.RawTextHelpFormatter)#ArgumentDefaultsHelpFormatter)
 
     parser.add_argument(
         help="""The PATH to search for tor log files, which may be '-'
 for STDIN; each log file may end in '.xz' to enable
-inline xz decompression""", 
+inline xz decompression""",
         metavar="PATH",
         action="store", dest="searchpath")
 
     parser.add_argument('-e', '--expression',
         help="""Append a regex PATTERN to the list of strings used with
-re.search to find tgen log file names in the search path""", 
+re.search to find tgen log file names in the search path""",
         action="append", dest="patterns",
         metavar="PATTERN",
         default=["torctl.*\.log"])
@@ -61,9 +61,9 @@ def main():
         action="store", dest="nprocesses", type=type_nonnegative_integer,
         default=1)
 
-    parser.add_argument('-p', '--prefix', 
+    parser.add_argument('-p', '--prefix',
         help="""A STRING directory path prefix where the processed data
-files generated by this script will be written""", 
+files generated by this script will be written""",
         metavar="STRING",
         action="store", dest="prefix",
         default=os.getcwd())
@@ -124,6 +124,7 @@ def process_tor_log(filename):
     name = None
     total_read, total_write = 0, 0
     boot_succeeded = False
+    first_second = None
 
     for line in source:
         try:
@@ -141,6 +142,10 @@ def process_tor_log(filename):
                 bwr = int(parts[9])
                 bww = int(parts[10])
 
+                if first_second is None:
+                    first_second = second
+                second -= first_second
+
                 if second not in d['bytes_read']: d['bytes_read'][second] = 0
                 d['bytes_read'][second] += bwr
                 total_read += bwr
@@ -204,4 +209,3 @@ def dump(data, prefix, filename, compress=True):
         with open(path, 'w') as outf: json.dump(data, outf, sort_keys=True, separators=(',', ': '), indent=2)
 
 if __name__ == '__main__': sys.exit(main())
-
