X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=io_u.c;h=b48c99dad3ed4a3eb25650de53f59203463af850;hb=99cbac76e5b14ea29163f6ea08c3ab807f5e5b19;hp=9cb68af4691025ff83f50c9d562292d94bfefccc;hpb=afe24a5a66350a3828e8965f7b189fc95b8bbf6c;p=fio.git

diff --git a/io_u.c b/io_u.c
index 9cb68af4..b48c99da 100644
--- a/io_u.c
+++ b/io_u.c
@@ -52,7 +52,11 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 	while (blocks < nr_blocks) {
 		unsigned int idx, bit;
 
-		if (!random_map_free(td, f, block))
+		/*
+		 * If we have a mixed random workload, we may
+		 * encounter blocks we already did IO to.
+		 */
+		if (!td->o.ddir_nr && !random_map_free(td, f, block))
 			break;
 
 		idx = RAND_MAP_IDX(td, f, block);
@@ -93,6 +97,35 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 	return 1;
 }
 
+static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
+				int ddir, unsigned long long *b)
+{
+	unsigned long long max_blocks = f->io_size / td->o.min_bs[ddir];
+	unsigned long long r, rb;
+	int loops = 5;
+
+	do {
+		r = os_random_long(&td->random_state);
+		if (!max_blocks)
+			*b = 0;
+		else
+			*b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+		if (td->o.norandommap)
+			break;
+		rb = *b + (f->file_offset / td->o.min_bs[ddir]);
+		loops--;
+	} while (!random_map_free(td, f, rb) && loops);
+
+	/*
+	 * if we failed to retrieve a truly random offset within
+	 * the loops assigned, see if there are free ones left at all
+	 */
+	if (!loops && get_next_free_block(td, f, b))
+		return 1;
+
+	return 0;
+}
+
 /*
  * For random io, generate a random new block and see if it's used. Repeat
  * until we find a free one. For sequential io, just return the end of
@@ -102,33 +135,19 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
 	struct fio_file *f = io_u->file;
 	const int ddir = io_u->ddir;
-	unsigned long long b, rb;
-	long r;
+	unsigned long long b;
 
-	if (td_random(td)) {
-		unsigned long long max_blocks = f->file_size / td->o.min_bs[ddir];
-		int loops = 5;
-
-		do {
-			r = os_random_long(&td->random_state);
-			if (!max_blocks)
-				b = 0;
-			else
-				b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
-			if (td->o.norandommap)
-				break;
-			rb = b + (f->file_offset / td->o.min_bs[ddir]);
-			loops--;
-		} while (!random_map_free(td, f, rb) && loops);
+	if (td_random(td) && (td->o.ddir_nr && !--td->ddir_nr)) {
+		td->ddir_nr = td->o.ddir_nr;
 
-		/*
-		 * if we failed to retrieve a truly random offset within
-		 * the loops assigned, see if there are free ones left at all
-		 */
-		if (!loops && get_next_free_block(td, f, &b))
+		if (get_next_rand_offset(td, f, ddir, &b))
 			return 1;
-	} else
+	} else {
+		if (f->last_pos >= f->real_file_size)
+			return 1;
+
 		b = f->last_pos / td->o.min_bs[ddir];
+	}
 
 	io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
 	if (io_u->offset >= f->real_file_size)
@@ -139,7 +158,6 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 
 static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
-	struct fio_file *f = io_u->file;
 	const int ddir = io_u->ddir;
 	unsigned int buflen;
 	long r;
@@ -153,19 +171,6 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 			buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
 	}
 
-	while (buflen + io_u->offset > f->real_file_size) {
-		if (buflen == td->o.min_bs[ddir]) {
-			if (!td->o.odirect) {
-				assert(io_u->offset <= f->real_file_size);
-				buflen = f->real_file_size - io_u->offset;
-				return buflen;
-			}
-			return 0;
-		}
-
-		buflen = td->o.min_bs[ddir];
-	}
-
 	return buflen;
 }
 
@@ -180,11 +185,22 @@ static void set_rwmix_bytes(struct thread_data *td)
 	 * whereas reads do not.
 	 */
 	rbytes = td->io_bytes[td->rwmix_ddir] - td->rwmix_bytes;
-	diff = td->o.rwmixread;
-	if (td->rwmix_ddir == DDIR_WRITE)
-		diff = 100 - diff;
+	diff = td->o.rwmix[td->rwmix_ddir ^ 1];
+
+	td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * ((100 - diff)) / diff);
+}
+
+static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
+{
+	unsigned int v;
+	long r;
 
-	td->rwmix_bytes = td->io_bytes[td->rwmix_ddir] + (rbytes * (100 - diff)) / diff;
+	r = os_random_long(&td->rwmix_state);
+	v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0)));
+	if (v < td->o.rwmix[DDIR_READ])
+		return DDIR_READ;
+
+	return DDIR_WRITE;
 }
 
 /*
@@ -202,6 +218,9 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
 		fio_gettime(&now, NULL);
 	 	elapsed = mtime_since_now(&td->rwmix_switch);
 
+		/*
+		 * if this is the first cycle, make it shorter
+		 */
 		cycle = td->o.rwmixcycle;
 		if (!td->rwmix_bytes)
 			cycle /= 10;
@@ -209,22 +228,30 @@ static enum fio_ddir get_rw_ddir(struct thread_data *td)
 		/*
 		 * Check if it's time to seed a new data direction.
 		 */
-		if (elapsed >= cycle &&
+		if (elapsed >= cycle ||
 		    td->io_bytes[td->rwmix_ddir] >= td->rwmix_bytes) {
-			unsigned int v;
-			long r;
-
-			r = os_random_long(&td->rwmix_state);
-			v = 1 + (int) (100.0 * (r / (RAND_MAX + 1.0)));
-			if (v < td->o.rwmixread) {
-				if (td->rwmix_ddir != DDIR_READ)
-					set_rwmix_bytes(td);
-				td->rwmix_ddir = DDIR_READ;
-			} else {
-				if (td->rwmix_ddir != DDIR_WRITE)
-					set_rwmix_bytes(td);
-				td->rwmix_ddir = DDIR_WRITE;
+			unsigned long long max_bytes;
+			enum fio_ddir ddir;			
+
+			/*
+			 * Put a top limit on how many bytes we do for
+			 * one data direction, to avoid overflowing the
+			 * ranges too much
+			 */
+			ddir = get_rand_ddir(td);
+			max_bytes = td->this_io_bytes[ddir];
+			if (max_bytes >= (td->o.size * td->o.rwmix[ddir] / 100)) {
+				if (!td->rw_end_set[ddir]) {
+					td->rw_end_set[ddir] = 1;
+					memcpy(&td->rw_end[ddir], &now, sizeof(now));
+				}
+				ddir ^= 1;
 			}
+
+			if (ddir != td->rwmix_ddir)
+				set_rwmix_bytes(td);
+
+			td->rwmix_ddir = ddir;
 			memcpy(&td->rwmix_switch, &now, sizeof(now));
 		}
 		return td->rwmix_ddir;
@@ -273,7 +300,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	   !(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
 	     td->io_issues[DDIR_WRITE] && should_fsync(td)) {
 		io_u->ddir = DDIR_SYNC;
-		return 0;
+		goto out;
 	}
 
 	io_u->ddir = get_rw_ddir(td);
@@ -292,12 +319,13 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	/*
 	 * mark entry before potentially trimming io_u
 	 */
-	if (!td->o.read_iolog && td_random(td) && !td->o.norandommap)
+	if (td_random(td) && !td->o.norandommap)
 		mark_random_map(td, io_u);
 
 	/*
 	 * If using a write iolog, store this entry.
 	 */
+out:
 	if (td->o.write_iolog_file)
 		write_iolog_put(td, io_u);
 
@@ -380,6 +408,8 @@ static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
 
 		fno = (unsigned int) ((double) td->o.nr_files * (r / (RAND_MAX + 1.0)));
 		f = &td->files[fno];
+		if (f->flags & FIO_FILE_DONE)
+			continue;
 
 		if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
 			return f;
@@ -402,6 +432,11 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
 		if (td->next_file >= td->o.nr_files)
 			td->next_file = 0;
 
+		if (f->flags & FIO_FILE_DONE) {
+			f = NULL;
+			continue;
+		}
+
 		if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
 			break;
 
@@ -417,7 +452,7 @@ static struct fio_file *get_next_file(struct thread_data *td)
 
 	assert(td->o.nr_files <= td->files_index);
 
-	if (!td->nr_open_files)
+	if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files)
 		return NULL;
 
 	f = td->file_service_file;
@@ -438,6 +473,9 @@ static struct fio_file *find_next_new_file(struct thread_data *td)
 {
 	struct fio_file *f;
 
+	if (!td->nr_open_files || td->nr_done_files >= td->o.nr_files)
+		return NULL;
+
 	if (td->o.file_service_type == FIO_FSERVICE_RR)
 		f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
 	else
@@ -512,6 +550,8 @@ set_file:
 		 */
 		io_u->file = NULL;
 		td_io_close_file(td, f);
+		f->flags |= FIO_FILE_DONE;
+		td->nr_done_files++;
 
 		/*
 		 * probably not the right place to do this, but see
@@ -534,15 +574,6 @@ set_file:
 		f->last_pos += td->o.zone_skip;
 	}
 
-	if (io_u->buflen + io_u->offset > f->real_file_size) {
-		if (td->io_ops->flags & FIO_RAWIO) {
-			put_io_u(td, io_u);
-			return NULL;
-		}
-
-		io_u->buflen = f->real_file_size - io_u->offset;
-	}
-
 	if (io_u->ddir != DDIR_SYNC) {
 		if (!io_u->buflen) {
 			put_io_u(td, io_u);
@@ -623,13 +654,14 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		add_bw_sample(td, idx, &icd->time);
 		io_u_mark_latency(td, msec);
 
-		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
+		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE &&
+		    td->o.verify != VERIFY_NONE)
 			log_io_piece(td, io_u);
 
 		icd->bytes_done[idx] += bytes;
 
 		if (io_u->end_io) {
-			ret = io_u->end_io(io_u);
+			ret = io_u->end_io(td, io_u);
 			if (ret && !icd->error)
 				icd->error = ret;
 		}
@@ -689,12 +721,10 @@ long io_u_queued_complete(struct thread_data *td, int min_events)
 	struct io_completion_data icd;
 	struct timespec *tvp = NULL;
 	int ret;
+	struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
 
-	if (!min_events) {
-		struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
-
+	if (!min_events)
 		tvp = &ts;
-	}
 
 	ret = td_io_getevents(td, min_events, td->cur_depth, tvp);
 	if (ret < 0) {