Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message May 26, 2018

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 12223a35ac7d975d7c2950c664d8caf7f9c065bf:

Merge branch 'sg-verify2' of https://github.com/vincentkfu/fio (2018-05-18 13:34:36 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to cf04b906fda16c6c14c420b71130a31d6580e9d8:

Fix typo in bssplit documentation (2018-05-25 08:14:50 -0600)

----------------------------------------------------------------
Bill O'Donnell (1):
make fio scripts python3-ready (part 2)

Jens Axboe (1):
Fix typo in bssplit documentation

 HOWTO                       |  2 +-
 fio.1                       |  2 +-
 tools/fio_jsonplus_clat2csv | 13 ++++--
 tools/plot/fio2gnuplot      | 97 ++++++++++++++++++++++++---------------------
 4 files changed, 62 insertions(+), 52 deletions(-)

---

Diff of recent changes:

HOWTO +1 -1
index 7680f9c..4398ffa 100644
@@ -1429,7 +1429,7 @@ Block size
 	If you want a workload that has 50% 2k reads and 50% 4k reads, while
 	having 90% 4k writes and 10% 8k writes, you would specify::
 
-		bssplit=2k/50:4k/50,4k/90,8k/10
+		bssplit=2k/50:4k/50,4k/90:8k/10
 
 	Fio supports defining up to 64 different weights for each data
 	direction.
fio.1 +1 -1
index ce3585a..733c740 100644
@@ -1227,7 +1227,7 @@ If you want a workload that has 50% 2k reads and 50% 4k reads, while having
 90% 4k writes and 10% 8k writes, you would specify:
 .RS
 .P
-bssplit=2k/50:4k/50,4k/90,8k/10
+bssplit=2k/50:4k/50,4k/90:8k/10
 .RE
 .P
 Fio supports defining up to 64 different weights for each data direction.
tools/fio_jsonplus_clat2csv +9 -4
index e63d6d8..78a007e 100755
@@ -1,4 +1,5 @@
 #!/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__':
tools/plot/fio2gnuplot +51 -46

226 lines not on this page · raw message