Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit a955f5297d6951517c663ac9effd94adfae6a563:

  Add blockdev_size() support for OpenBSD (2016-10-26 08:00:10 -0600)

are available in the git repository at:

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

for you to fetch changes up to 4e795a3e0940509bd991682ec029000b6aa8881b:

  Remove extra space in tausworthe32 warning message (2016-11-01 14:24:50 -0600)

----------------------------------------------------------------
Bruce Cran (1):
      Remove extra space in tausworthe32 warning message

Jens Axboe (2):
      backend: cleanup check for completion/issue byte checking
      Merge branch 'HOWTO-cleanup' of https://github.com/szaydel/fio

Sam Zaydel (1):
      Fix minor spelling mistakes in HOWTO document

 HOWTO       | 33 ++++++++++++++++-----------------
 backend.c   | 34 +++++++++++-----------------------
 filesetup.c |  2 +-
 3 files changed, 28 insertions(+), 41 deletions(-)

---

Diff of recent changes:

diff --git a/HOWTO b/HOWTO
index 3f8acee..577eed9 100644
--- a/HOWTO
+++ b/HOWTO
@@ -803,8 +803,8 @@ ioengine=str	Defines how the job issues io to the file. The following
 				cannot be modified. So random writes are not
 				possible. To imitate this, libhdfs engine
 				creates bunch of small files, and engine will
-				pick a file out of those files based on the 
-				offset enerated by fio backend. Each jobs uses
+				pick a file out of those files based on the
+				offset generated by fio backend. Each jobs uses
 				it's own connection to HDFS.
 
 			mtd	Read, write and erase an MTD character device
@@ -864,7 +864,7 @@ iodepth_batch_complete_max=int This defines maximum pieces of IO to
 		iodepth_batch_complete_min=1
 		iodepth_batch_complete_max=<iodepth>
 
-		which means that we will retrieve at leat 1 IO and up to the
+		which means that we will retrieve at least 1 IO and up to the
 		whole submitted queue depth. If none of IO has been completed
 		yet, we will wait.
 
@@ -986,7 +986,7 @@ random_distribution=str:float	By default, fio will use a completely uniform
 		random		Uniform random distribution
 		zipf		Zipf distribution
 		pareto		Pareto distribution
-		gauss		Normal (guassian) distribution
+		gauss		Normal (gaussian) distribution
 		zoned		Zoned random distribution
 
 		When using a zipf or pareto distribution, an input value
@@ -1027,7 +1027,7 @@ percentage_random=int	For a random workload, set how big a percentage should
 		and random IO, at the given percentages. It is possible to
 		set different values for reads, writes, and trim. To do so,
 		simply use a comma separated list. See blocksize.
-	
+
 norandommap	Normally fio will cover every block of the file when doing
 		random IO. If this option is given, fio will just get a
 		new random offset without looking at past io history. This
@@ -1185,7 +1185,7 @@ numa_cpu_nodes=str Set this job running on specified NUMA nodes' CPUs. The
 		fio must be built on a system with libnuma-dev(el) installed.
 
 numa_mem_policy=str Set this job's memory policy and corresponding NUMA
-		nodes. Format of the argements:
+		nodes. Format of the arguments:
 			<mode>[:<nodelist>]
 		`mode' is one of the following memory policy:
 			default, prefer, bind, interleave, local
@@ -1266,7 +1266,7 @@ mem=str		Fio can use various types of memory as the io unit buffer.
 		location should point there. So if it's mounted in /huge,
 		you would use mem=mmaphuge:/huge/somefile.
 
-iomem_align=int	This indiciates the memory alignment of the IO memory buffers.
+iomem_align=int	This indicates the memory alignment of the IO memory buffers.
 		Note that the given alignment is applied to the first IO unit
 		buffer, if using iodepth the alignment of the following buffers
 		are given by the bs used. In other words, if using a bs that is
@@ -1330,7 +1330,7 @@ pre_read=bool	If this is given, files will be pre-read into memory before
 		starting the given IO operation. This will also clear
 		the 'invalidate' flag, since it is pointless to pre-read
 		and then drop the cache. This will only work for IO engines
-		that are seekable, since they allow you to read the same data
+		that are seek-able, since they allow you to read the same data
 		multiple times. Thus it will not work on eg network or splice
 		IO.
 
@@ -1372,7 +1372,7 @@ verify=str	If writing to a file, fio can verify the file contents
 			crc32c	Use a crc32c sum of the data area and store
 				it in the header of each block.
 
-			crc32c-intel Use hardware assisted crc32c calcuation
+			crc32c-intel Use hardware assisted crc32c calculation
 				provided on SSE4.2 enabled processors. Falls
 				back to regular software crc32c, if not
 				supported by the system.
@@ -1447,7 +1447,7 @@ verify_pattern=str	If set, fio will fill the io buffers with this
 		be a hex number that starts with either "0x" or "0X". Use
 		with verify=str. Also, verify_pattern supports %o format,
 		which means that for each block offset will be written and
-		then verifyied back, e.g.:
+		then verified back, e.g.:
 
 		verify_pattern=%o
 
@@ -1579,7 +1579,7 @@ replay_redirect=str While replaying I/O patterns using read_iolog the
 		multiple devices to be replayed concurrently to multiple
 		redirected devices you must blkparse your trace into separate
 		traces and replay them with independent fio invocations.
-		Unfortuantely this also breaks the strict time ordering
+		Unfortunately this also breaks the strict time ordering
 		between multiple device accesses.
 
 replay_align=int	Force alignment of IO offsets and lengths in a trace
@@ -1924,7 +1924,7 @@ be the starting port number since fio will use a range of ports.
 		connections rather than initiating an outgoing connection. The
 		hostname must be omitted if this option is used.
 
-[net] pingpong	Normaly a network writer will just continue writing data, and
+[net] pingpong	Normally a network writer will just continue writing data, and
 		a network reader will just consume packages. If pingpong=1
 		is set, a writer will send its normal payload to the reader,
 		then wait for the reader to send the same payload back. This
@@ -1945,15 +1945,15 @@ be the starting port number since fio will use a range of ports.
 [e4defrag] inplace=int
 		Configure donor file blocks allocation strategy
 		0(default): Preallocate donor's file on init
-		1 	  : allocate space immidietly inside defragment event,
+		1 	  : allocate space immediately inside defragment event,
 			    and free right after event
 
 [rbd] clustername=str	Specifies the name of the Ceph cluster.
 [rbd] rbdname=str	Specifies the name of the RBD.
-[rbd] pool=str		Specifies the naem of the Ceph pool containing RBD.
+[rbd] pool=str		Specifies the name of the Ceph pool containing RBD.
 [rbd] clientname=str	Specifies the username (without the 'client.' prefix)
 			used to access the Ceph cluster. If the clustername is
-			specified, the clientmae shall be the full type.id
+			specified, the clientname shall be the full type.id
 			string. If no type. prefix is given, fio will add
 			'client.' by default.
 
@@ -2353,10 +2353,9 @@ Data direction is one of the following:
 The offset is the offset, in bytes, from the start of the file, for that
 particular IO. The logging of the offset can be toggled with 'log_offset'.
 
-If windowed logging is enabled though 'log_avg_msec', then fio doesn't log
+If windowed logging is enabled through 'log_avg_msec', then fio doesn't log
 individual IOs. Instead of logs the average values over the specified
 period of time. Since 'data direction' and 'offset' are per-IO values,
 they aren't applicable if windowed logging is enabled. If windowed logging
 is enabled and 'log_max_value' is set, then fio logs maximum values in
 that window instead of averages.
-
diff --git a/backend.c b/backend.c
index ed4f1f0..60cea3c 100644
--- a/backend.c
+++ b/backend.c
@@ -771,18 +771,18 @@ static bool exceeds_number_ios(struct thread_data *td)
 	return number_ios >= (td->o.number_ios * td->loops);
 }
 
-static bool io_issue_bytes_exceeded(struct thread_data *td)
+static bool io_bytes_exceeded(struct thread_data *td, uint64_t *this_bytes)
 {
 	unsigned long long bytes, limit;
 
 	if (td_rw(td))
-		bytes = td->io_issue_bytes[DDIR_READ] + td->io_issue_bytes[DDIR_WRITE];
+		bytes = this_bytes[DDIR_READ] + this_bytes[DDIR_WRITE];
 	else if (td_write(td))
-		bytes = td->io_issue_bytes[DDIR_WRITE];
+		bytes = this_bytes[DDIR_WRITE];
 	else if (td_read(td))
-		bytes = td->io_issue_bytes[DDIR_READ];
+		bytes = this_bytes[DDIR_READ];
 	else
-		bytes = td->io_issue_bytes[DDIR_TRIM];
+		bytes = this_bytes[DDIR_TRIM];
 
 	if (td->o.io_limit)
 		limit = td->o.io_limit;
@@ -793,26 +793,14 @@ static bool io_issue_bytes_exceeded(struct thread_data *td)
 	return bytes >= limit || exceeds_number_ios(td);
 }
 
-static bool io_complete_bytes_exceeded(struct thread_data *td)
+static bool io_issue_bytes_exceeded(struct thread_data *td)
 {
-	unsigned long long bytes, limit;
-
-	if (td_rw(td))
-		bytes = td->this_io_bytes[DDIR_READ] + td->this_io_bytes[DDIR_WRITE];
-	else if (td_write(td))
-		bytes = td->this_io_bytes[DDIR_WRITE];
-	else if (td_read(td))
-		bytes = td->this_io_bytes[DDIR_READ];
-	else
-		bytes = td->this_io_bytes[DDIR_TRIM];
-
-	if (td->o.io_limit)
-		limit = td->o.io_limit;
-	else
-		limit = td->o.size;
+	return io_bytes_exceeded(td, td->io_issue_bytes);
+}
 
-	limit *= td->loops;
-	return bytes >= limit || exceeds_number_ios(td);
+static bool io_complete_bytes_exceeded(struct thread_data *td)
+{
+	return io_bytes_exceeded(td, td->this_io_bytes);
 }
 
 /*
diff --git a/filesetup.c b/filesetup.c
index a3bbbb2..969e7cc 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -1098,7 +1098,7 @@ static int check_rand_gen_limits(struct thread_data *td, struct fio_file *f,
 	if (!fio_option_is_set(&td->o, random_generator)) {
 		log_info("fio: Switching to tausworthe64. Use the "
 			 "random_generator= option to get rid of this "
-			 " warning.\n");
+			 "warning.\n");
 		td->o.random_generator = FIO_RAND_GEN_TAUSWORTHE64;
 		return 0;
 	}