Recent changes

[Jens Axboe <jaxboe@xxxxxxxxxxxx>]

The following changes since commit b4b317df958821978a1b255fa16f15590c6ffbfa:

  Added 99.95 and 99.99 default percentiles. (2012-03-17 13:16:28 +0100)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (4):
      Fio 2.0.6
      Allow readwrite as an alias for rw in setting sequential read/write
      Add regression test for ae2fafc8
      stat: move final \n of terse output to the end

Vikram Seth (1):
      Fix terse output with description set

webee (1):
      verify: verify bytes should not add to this_io_bytes

 HOWTO                     |    2 +-
 fio.1                     |    2 +-
 fio_version.h             |    2 +-
 io_u.c                    |    4 +++-
 options.c                 |    4 ++++
 stat.c                    |    3 ++-
 t/jobs/t0008-ae2fafc8.fio |   12 ++++++++++++
 7 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 t/jobs/t0008-ae2fafc8.fio

---

Diff of recent changes:

diff --git a/HOWTO b/HOWTO
index e4614ea..5622349 100644
--- a/HOWTO
+++ b/HOWTO
@@ -310,7 +310,7 @@ rw=str		Type of io pattern. Accepted values are:
 			write		Sequential writes
 			randwrite	Random writes
 			randread	Random reads
-			rw		Sequential mixed reads and writes
+			rw,readwrite	Sequential mixed reads and writes
 			randrw		Random mixed reads and writes
 
 		For the mixed io types, the default is to split them 50/50.
diff --git a/fio.1 b/fio.1
index c4c90b4..bcae37b 100644
--- a/fio.1
+++ b/fio.1
@@ -195,7 +195,7 @@ Random reads.
 .B randwrite
 Random writes.
 .TP
-.B rw
+.B rw, readwrite
 Mixed sequential reads and writes.
 .TP
 .B randrw 
diff --git a/fio_version.h b/fio_version.h
index 25114c6..42c0ff7 100644
--- a/fio_version.h
+++ b/fio_version.h
@@ -3,6 +3,6 @@
 
 #define FIO_MAJOR	2
 #define FIO_MINOR	0
-#define FIO_PATCH	5
+#define FIO_PATCH	6
 
 #endif
diff --git a/io_u.c b/io_u.c
index a4f378d..6646332 100644
--- a/io_u.c
+++ b/io_u.c
@@ -1381,7 +1381,9 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		td->io_blocks[idx]++;
 		td->this_io_blocks[idx]++;
 		td->io_bytes[idx] += bytes;
-		td->this_io_bytes[idx] += bytes;
+
+		if (!(io_u->flags & IO_U_F_VER_LIST))
+			td->this_io_bytes[idx] += bytes;
 
 		if (idx == DDIR_WRITE) {
 			f = io_u->file;
diff --git a/options.c b/options.c
index 3de0221..f8927ee 100644
--- a/options.c
+++ b/options.c
@@ -944,6 +944,10 @@ static struct fio_option options[FIO_MAX_OPTS] = {
 			    .oval = TD_DDIR_RW,
 			    .help = "Sequential read and write mix",
 			  },
+			  { .ival = "readwrite",
+			    .oval = TD_DDIR_RW,
+			    .help = "Sequential read and write mix",
+			  },
 			  { .ival = "randrw",
 			    .oval = TD_DDIR_RANDRW,
 			    .help = "Random read and write mix"
diff --git a/stat.c b/stat.c
index fa9af7c..26f45f4 100644
--- a/stat.c
+++ b/stat.c
@@ -782,11 +782,12 @@ static void show_thread_status_terse_v3(struct thread_stat *ts,
 	/* Additional output if continue_on_error set - default off*/
 	if (ts->continue_on_error)
 		log_info(";%lu;%d", ts->total_err_count, ts->first_error);
-	log_info("\n");
 
 	/* Additional output if description is set */
 	if (strlen(ts->description))
 		log_info(";%s", ts->description);
+
+	log_info("\n");
 }
 
 static void show_thread_status_terse(struct thread_stat *ts,
diff --git a/t/jobs/t0008-ae2fafc8.fio b/t/jobs/t0008-ae2fafc8.fio
new file mode 100644
index 0000000..4b36485
--- /dev/null
+++ b/t/jobs/t0008-ae2fafc8.fio
@@ -0,0 +1,12 @@
+# Expected result: fio writes 16MB, reads 16+16MB
+# Buggy result: fio writes 16MB, reads ~21MB
+[global]
+bs=4k
+verify=crc32c
+rw=readwrite
+direct=1
+
+[foo]
+size=32m
+do_verify=1
+verify_backlog=1
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html