X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=tools%2Ffio_jsonplus_clat2csv;h=78a007e57e5837f6d35a4b1f9caa8fa68b4420ca;hb=a06be957386f23a0ac94f215cd1e23e6f4c93161;hp=64fdc9f3a00b187605c5c02db12391c4bf1d5291;hpb=f8c48f59773d0a26526472dbee116a4772aec930;p=fio.git diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv index 64fdc9f3..78a007e5 100755 --- 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 # @@ -60,9 +61,13 @@ # 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 six +from six.moves import range def parse_args(): @@ -87,7 +92,7 @@ def percentile(idx, run_total): 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 @@ -116,8 +121,8 @@ def main(): "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]))] @@ -165,7 +170,7 @@ def main(): output.write(", , , ") output.write("\n") - print "{0} generated".format(outfile) + print("{0} generated".format(outfile)) if __name__ == '__main__':