projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ddn-ime'
[fio.git]
/
tools
/
fio_jsonplus_clat2csv
diff --git
a/tools/fio_jsonplus_clat2csv
b/tools/fio_jsonplus_clat2csv
index 64fdc9f3a00b187605c5c02db12391c4bf1d5291..78a007e57e5837f6d35a4b1f9caa8fa68b4420ca 100755
(executable)
--- a/
tools/fio_jsonplus_clat2csv
+++ b/
tools/fio_jsonplus_clat2csv
@@
-1,4
+1,5
@@
-#!/usr/bin/python
+#!/usr/bin/python2.7
+# Note: this script is python2 and python3 compatible.
#
# fio_jsonplus_clat2csv
#
#
# fio_jsonplus_clat2csv
#
@@
-60,9
+61,13
@@
# 10304ns is the 100th percentile for read latency
#
# 10304ns is the 100th percentile for read latency
#
+from __future__ import absolute_import
+from __future__ import print_function
import os
import json
import argparse
import os
import json
import argparse
+import six
+from six.moves import range
def parse_args():
def parse_args():
@@
-87,7
+92,7
@@
def percentile(idx, run_total):
def more_lines(indices, bins):
def more_lines(indices, bins):
- for key, value in
indices.iteritems(
):
+ for key, value in
six.iteritems(indices
):
if value < len(bins[key]):
return True
if value < len(bins[key]):
return True
@@
-116,8
+121,8
@@
def main():
"Are you sure you are using json+ output?")
bins[ddir] = [[int(key), value] for key, value in
"Are you sure you are using json+ output?")
bins[ddir] = [[int(key), value] for key, value in
- jsondata['jobs'][jobnum][ddir][bins_loc]
- ['bins']
.iteritems(
)]
+
six.iteritems(
jsondata['jobs'][jobnum][ddir][bins_loc]
+ ['bins'])]
bins[ddir] = sorted(bins[ddir], key=lambda bin: bin[0])
run_total[ddir] = [0 for x in range(0, len(bins[ddir]))]
bins[ddir] = sorted(bins[ddir], key=lambda bin: bin[0])
run_total[ddir] = [0 for x in range(0, len(bins[ddir]))]
@@
-165,7
+170,7
@@
def main():
output.write(", , , ")
output.write("\n")
output.write(", , , ")
output.write("\n")
- print
"{0} generated".format(outfile
)
+ print
("{0} generated".format(outfile)
)
if __name__ == '__main__':
if __name__ == '__main__':