From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 19 Sep 2018 15:42:47 +0000 (-0600)
Subject: Merge branch 'epoch-time-hist-logs' of https://github.com/parallel-fs-utils/fio
X-Git-Tag: fio-3.11~34
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=5fa4aff59e4eec471b2c534702f0162006845c4b

Merge branch 'epoch-time-hist-logs' of https://github.com/parallel-fs-utils/fio

* '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
---

5fa4aff59e4eec471b2c534702f0162006845c4b
diff --cc tools/hist/fio-histo-log-pctiles.py
index 1e7b6316,81f6de6e..7f08f6e3
--- a/tools/hist/fio-histo-log-pctiles.py
+++ b/tools/hist/fio-histo-log-pctiles.py
@@@ -21,15 -21,10 +21,15 @@@
  # 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