Merge branch 'epoch-time-hist-logs' of https://github.com/parallel-fs-utils/fio
authorJens Axboe <axboe@kernel.dk>
Wed, 19 Sep 2018 15:42:47 +0000 (09:42 -0600)
committerJens Axboe <axboe@kernel.dk>
Wed, 19 Sep 2018 15:42:47 +0000 (09:42 -0600)
* 'epoch-time-hist-logs' of https://github.com/parallel-fs-utils/fio:
  raise exception if test start time can't be estimated
  handle log_unix_epoch=1

1  2 
tools/hist/fio-histo-log-pctiles.py

index 1e7b6316acbcf1b23ff1368b27cfc6c062444feb,81f6de6e1a1e20842d4c83fc87594f9fe0911a6c..7f08f6e32d15cb64946ec53bf42db816ad741669
  # if you do this, don't pass normal CLI parameters to it
  # otherwise it runs the CLI
  
- import sys, os, math, copy
+ import sys, os, math, copy, time
  from copy import deepcopy
  import argparse
 -import unittest2
 +
 +unittest2_imported = True
 +try:
 +    import unittest2
 +except ImportError:
 +    unittest2_imported = False
  
  msec_per_sec = 1000
  nsec_per_usec = 1000