X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=9a3cc94897d3c49928ef27f2dade7504c955f81a;hp=a394ff8c0d3045ad33e3fdc24f7e022a3e13bed0;hb=f423479dad8916c758792308863dcd833a1a36c8;hpb=50070b5a3b37f013a2b0b968e1b8b34bffff8589

diff --git a/fio.c b/fio.c
index a394ff8c..9a3cc948 100644
--- a/fio.c
+++ b/fio.c
@@ -96,9 +96,15 @@ static void sig_handler(int sig)
  */
 static int check_min_rate(struct thread_data *td, struct timeval *now)
 {
+	unsigned long long bytes = 0;
 	unsigned long spent;
 	unsigned long rate;
-	int ddir = td->ddir;
+
+	/*
+	 * No minimum rate set, always ok
+	 */
+	if (!td->ratemin)
+		return 0;
 
 	/*
 	 * allow a 2 second settle period in the beginning
@@ -106,6 +112,11 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 	if (mtime_since(&td->start, now) < 2000)
 		return 0;
 
+	if (td_read(td))
+		bytes += td->this_io_bytes[DDIR_READ];
+	if (td_write(td))
+		bytes += td->this_io_bytes[DDIR_WRITE];
+
 	/*
 	 * if rate blocks is set, sample is running
 	 */
@@ -114,14 +125,19 @@ static int check_min_rate(struct thread_data *td, struct timeval *now)
 		if (spent < td->ratecycle)
 			return 0;
 
-		rate = (td->this_io_bytes[ddir] - td->rate_bytes) / spent;
-		if (rate < td->ratemin) {
-			fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+		if (bytes < td->rate_bytes) {
+			fprintf(f_out, "%s: min rate %u not met\n", td->name, td->ratemin);
 			return 1;
+		} else {
+			rate = (bytes - td->rate_bytes) / spent;
+			if (rate < td->ratemin || bytes < td->rate_bytes) {
+				fprintf(f_out, "%s: min rate %u not met, got %luKiB/sec\n", td->name, td->ratemin, rate);
+				return 1;
+			}
 		}
 	}
 
-	td->rate_bytes = td->this_io_bytes[ddir];
+	td->rate_bytes = bytes;
 	memcpy(&td->lastrate, now, sizeof(*now));
 	return 0;
 }
@@ -149,7 +165,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	/*
 	 * get immediately available events, if any
 	 */
-	r = io_u_queued_complete(td, 0, NULL);
+	r = io_u_queued_complete(td, 0);
 	if (r < 0)
 		return;
 
@@ -177,7 +193,7 @@ static void cleanup_pending_aio(struct thread_data *td)
 	}
 
 	if (td->cur_depth)
-		r = io_u_queued_complete(td, td->cur_depth, NULL);
+		r = io_u_queued_complete(td, td->cur_depth);
 }
 
 /*
@@ -203,19 +219,19 @@ static int fio_io_sync(struct thread_data *td, struct fio_file *f)
 requeue:
 	ret = td_io_queue(td, io_u);
 	if (ret < 0) {
-		td_verror(td, io_u->error);
+		td_verror(td, io_u->error, "td_io_queue");
 		put_io_u(td, io_u);
 		return 1;
 	} else if (ret == FIO_Q_QUEUED) {
-		if (io_u_queued_complete(td, 1, NULL) < 0)
+		if (io_u_queued_complete(td, 1) < 0)
 			return 1;
 	} else if (ret == FIO_Q_COMPLETED) {
 		if (io_u->error) {
-			td_verror(td, io_u->error);
+			td_verror(td, io_u->error, "td_io_queue");
 			return 1;
 		}
 
-		if (io_u_sync_complete(td, io_u, NULL) < 0)
+		if (io_u_sync_complete(td, io_u) < 0)
 			return 1;
 	} else if (ret == FIO_Q_BUSY) {
 		if (td_io_commit(td))
@@ -272,6 +288,8 @@ static void do_verify(struct thread_data *td)
 			put_io_u(td, io_u);
 			break;
 		}
+
+		io_u->end_io = verify_io_u;
 requeue:
 		ret = td_io_queue(td, io_u);
 
@@ -286,7 +304,7 @@ requeue:
 				io_u->xfer_buf += bytes;
 				goto requeue;
 			}
-			ret = io_u_sync_complete(td, io_u, verify_io_u);
+			ret = io_u_sync_complete(td, io_u);
 			if (ret < 0)
 				break;
 			continue;
@@ -298,7 +316,7 @@ requeue:
 			break;
 		default:
 			assert(ret < 0);
-			td_verror(td, -ret);
+			td_verror(td, -ret, "td_io_queue");
 			break;
 		}
 
@@ -321,11 +339,16 @@ requeue:
 		 * Reap required number of io units, if any, and do the
 		 * verification on them through the callback handler
 		 */
-		if (io_u_queued_complete(td, min_events, verify_io_u) < 0)
+		if (io_u_queued_complete(td, min_events) < 0)
 			break;
 	}
 
-	if (td->cur_depth)
+	if (!td->error) {
+		min_events = td->cur_depth;
+
+		if (min_events)
+			ret = io_u_queued_complete(td, min_events);
+	} else
 		cleanup_pending_aio(td);
 
 	td_set_runstate(td, TD_RUNNING);
@@ -404,7 +427,7 @@ requeue:
 				goto requeue;
 			}
 			fio_gettime(&comp_time, NULL);
-			bytes_done = io_u_sync_complete(td, io_u, NULL);
+			bytes_done = io_u_sync_complete(td, io_u);
 			if (bytes_done < 0)
 				ret = bytes_done;
 			break;
@@ -443,7 +466,7 @@ requeue:
 			}
 
 			fio_gettime(&comp_time, NULL);
-			bytes_done = io_u_queued_complete(td, min_evts, NULL);
+			bytes_done = io_u_queued_complete(td, min_evts);
 			if (bytes_done < 0)
 				break;
 		}
@@ -458,12 +481,12 @@ requeue:
 		 */
 		usec = utime_since(&s, &comp_time);
 
-		rate_throttle(td, usec, bytes_done, td->ddir);
+		rate_throttle(td, usec, bytes_done);
 
 		if (check_min_rate(td, &comp_time)) {
 			if (exitall_on_terminate)
 				terminate_threads(td->groupid, 0);
-			td_verror(td, ENODATA);
+			td_verror(td, ENODATA, "check_min_rate");
 			break;
 		}
 
@@ -487,15 +510,17 @@ requeue:
 	if (!td->error) {
 		struct fio_file *f;
 
-		if (td->cur_depth)
-			cleanup_pending_aio(td);
+		i = td->cur_depth;
+		if (i)
+			ret = io_u_queued_complete(td, i);
 
 		if (should_fsync(td) && td->end_fsync) {
 			td_set_runstate(td, TD_FSYNCING);
 			for_each_file(td, f, i)
 				fio_io_sync(td, f);
 		}
-	}
+	} else
+		cleanup_pending_aio(td);
 }
 
 static void cleanup_io_u(struct thread_data *td)
@@ -585,7 +610,7 @@ static int switch_ioscheduler(struct thread_data *td)
 
 	f = fopen(tmp, "r+");
 	if (!f) {
-		td_verror(td, errno);
+		td_verror(td, errno, "fopen");
 		return 1;
 	}
 
@@ -594,7 +619,7 @@ static int switch_ioscheduler(struct thread_data *td)
 	 */
 	ret = fwrite(td->ioscheduler, strlen(td->ioscheduler), 1, f);
 	if (ferror(f) || ret != 1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "fwrite");
 		fclose(f);
 		return 1;
 	}
@@ -606,7 +631,7 @@ static int switch_ioscheduler(struct thread_data *td)
 	 */
 	ret = fread(tmp, 1, sizeof(tmp), f);
 	if (ferror(f) || ret < 0) {
-		td_verror(td, errno);
+		td_verror(td, errno, "fread");
 		fclose(f);
 		return 1;
 	}
@@ -614,7 +639,7 @@ static int switch_ioscheduler(struct thread_data *td)
 	sprintf(tmp2, "[%s]", td->ioscheduler);
 	if (!strstr(tmp, tmp2)) {
 		log_err("fio: io scheduler %s not found\n", td->ioscheduler);
-		td_verror(td, EINVAL);
+		td_verror(td, EINVAL, "iosched_switch");
 		fclose(f);
 		return 1;
 	}
@@ -670,7 +695,7 @@ static void *thread_main(void *data)
 		goto err;
 
 	if (fio_setaffinity(td) == -1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "cpu_set_affinity");
 		goto err;
 	}
 
@@ -679,13 +704,13 @@ static void *thread_main(void *data)
 
 	if (td->ioprio) {
 		if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
-			td_verror(td, errno);
+			td_verror(td, errno, "ioprio_set");
 			goto err;
 		}
 	}
 
 	if (nice(td->nice) == -1) {
-		td_verror(td, errno);
+		td_verror(td, errno, "nice");
 		goto err;
 	}
 
@@ -736,10 +761,11 @@ static void *thread_main(void *data)
 		else
 			do_io(td);
 
-		runtime[td->ddir] += utime_since_now(&td->start);
-		if (td_rw(td) && td->io_bytes[td->ddir ^ 1])
-			runtime[td->ddir ^ 1] = runtime[td->ddir];
-
+		if (td_read(td) && td->io_bytes[DDIR_READ])
+			runtime[DDIR_READ] += utime_since_now(&td->start);
+		if (td_write(td) && td->io_bytes[DDIR_WRITE])
+			runtime[DDIR_WRITE] += utime_since_now(&td->start);
+		
 		if (td->error || td->terminate)
 			break;
 
@@ -824,7 +850,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 	 */
 	pending = cputhreads = 0;
 	for_each_td(td, i) {
-		int flags;
+		int flags = 0;
 
 		/*
 		 * ->io_ops is NULL for a thread that has closed its
@@ -835,6 +861,13 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 
 		if (!td->pid || td->runstate == TD_REAPED)
 			continue;
+		if (td->use_thread) {
+			if (td->runstate == TD_EXITED) {
+				td_set_runstate(td, TD_REAPED);
+				goto reaped;
+			}
+			continue;
+		}
 
 		flags = WNOHANG;
 		if (td->runstate == TD_EXITED)
@@ -844,7 +877,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		 * check if someone quit or got killed in an unusual way
 		 */
 		ret = waitpid(td->pid, &status, flags);
-		if (ret < 0 && !td->use_thread) {
+		if (ret < 0) {
 			if (errno == ECHILD) {
 				log_err("fio: pid=%d disappeared %d\n", td->pid, td->runstate);
 				td_set_runstate(td, TD_REAPED);
@@ -862,12 +895,7 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 			if (WIFEXITED(status)) {
 				if (WEXITSTATUS(status) && !td->error)
 					td->error = WEXITSTATUS(status);
-				if (td->use_thread) {
-					long ret;
 
-					if (pthread_join(td->thread, (void *) &ret))
-						perror("pthread_join");
-				}
 				td_set_runstate(td, TD_REAPED);
 				goto reaped;
 			}
@@ -878,6 +906,13 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate)
 		 */
 		continue;
 reaped:
+		if (td->use_thread) {
+			long ret;
+
+			if (pthread_join(td->thread, (void *) &ret))
+				perror("pthread_join");
+		}
+
 		(*nr_running)--;
 		(*m_rate) -= td->ratemin;
 		(*t_rate) -= td->rate;