X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.c;h=355d8730862643eb02aff27a90d56f1188818572;hb=ad830ed7386eff264bdb5189675d6dfa672bd16b;hp=6f9a378b3599084927f1cb940aa9b28d8ff7648d;hpb=b4c5e1acb5a7964f858e2b41c1ae07b1afc0f4ea;p=fio.git

diff --git a/fio.c b/fio.c
index 6f9a378b..355d8730 100644
--- a/fio.c
+++ b/fio.c
@@ -60,6 +60,8 @@ struct io_log *agg_io_log[2];
 
 static inline void td_set_runstate(struct thread_data *td, int runstate)
 {
+	dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", td->pid, td->runstate,
+								runstate);
 	td->runstate = runstate;
 }
 
@@ -70,13 +72,18 @@ static void terminate_threads(int group_id)
 
 	for_each_td(td, i) {
 		if (group_id == TERMINATE_ALL || groupid == td->groupid) {
+			dprint(FD_PROCESS, "setting terminate on %d\n",td->pid);
+
+			td->terminate = 1;
+			td->o.start_delay = 0;
+
 			/*
 			 * if the thread is running, just let it exit
 			 */
 			if (td->runstate < TD_RUNNING)
 				kill(td->pid, SIGQUIT);
-			td->terminate = 1;
-			td->o.start_delay = 0;
+			else if (td->io_ops->flags & FIO_SIGQUIT)
+				kill(td->pid, SIGQUIT);
 		}
 	}
 }
@@ -568,6 +575,10 @@ sync_done:
 		}
 	}
 
+	if (td->o.fill_device && td->error == ENOSPC) {
+		td->error = 0;
+		td->terminate = 1;
+	}
 	if (!td->error) {
 		struct fio_file *f;
 
@@ -586,6 +597,12 @@ sync_done:
 		}
 	} else
 		cleanup_pending_aio(td);
+
+	/*
+	 * stop job if we failed doing any IO
+	 */
+	if ((td->this_io_bytes[0] + td->this_io_bytes[1]) == 0)
+		td->done = 1;
 }
 
 static void cleanup_io_u(struct thread_data *td)
@@ -626,11 +643,7 @@ static int init_io_u(struct thread_data *td)
 	int i, max_units;
 	char *p;
 
-	if (td->io_ops->flags & FIO_SYNCIO)
-		max_units = 1;
-	else
-		max_units = td->o.iodepth;
-
+	max_units = td->o.iodepth;
 	max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
 	td->orig_buffer_size = (unsigned long long) max_bs * (unsigned long long) max_units;
 
@@ -764,7 +777,10 @@ static int clear_io_state(struct thread_data *td)
 
 	td->last_was_sync = 0;
 
-	if (td->o.time_based)
+	/*
+	 * reset file done count if we are to start over
+	 */
+	if (td->o.time_based || td->o.loops)
 		td->nr_done_files = 0;
 
 	for_each_file(td, f, i)
@@ -787,9 +803,8 @@ static int clear_io_state(struct thread_data *td)
  */
 static void *thread_main(void *data)
 {
-	unsigned long long runtime[2];
+	unsigned long long runtime[2], elapsed;
 	struct thread_data *td = data;
-	unsigned long elapsed;
 	int clear_state;
 
 	if (!td->o.use_thread)
@@ -797,6 +812,8 @@ static void *thread_main(void *data)
 
 	td->pid = getpid();
 
+	dprint(FD_PROCESS, "jobs pid=%d started\n", td->pid);
+
 	INIT_LIST_HEAD(&td->io_u_freelist);
 	INIT_LIST_HEAD(&td->io_u_busylist);
 	INIT_LIST_HEAD(&td->io_u_requeues);
@@ -829,7 +846,7 @@ static void *thread_main(void *data)
 		goto err;
 	}
 
-	if (td->ioprio) {
+	if (td->ioprio_set) {
 		if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
 			td_verror(td, errno, "ioprio_set");
 			goto err;
@@ -1059,8 +1076,11 @@ reaped:
 		if (td->o.use_thread) {
 			long ret;
 
-			if (pthread_join(td->thread, (void *) &ret))
+			dprint(FD_PROCESS, "joining tread %d\n", td->pid);
+			if (pthread_join(td->thread, (void *) &ret)) {
+				dprint(FD_PROCESS, "join failed %ld\n", ret);
 				perror("pthread_join");
+			}
 		}
 
 		(*nr_running)--;
@@ -1175,12 +1195,14 @@ static void run_threads(void)
 			nr_started++;
 
 			if (td->o.use_thread) {
+				dprint(FD_PROCESS, "will pthread_create\n");
 				if (pthread_create(&td->thread, NULL, thread_main, td)) {
 					perror("thread_create");
 					nr_started--;
 					break;
 				}
 			} else {
+				dprint(FD_PROCESS, "will fork\n");
 				if (!fork()) {
 					int ret = fork_main(shm_id, i);