for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
- if (td->runstate <= TD_RUNNING)
+ /*
+ * 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;
p = ALIGN(td->orig_buffer);
for (i = 0; i < max_units; i++) {
+ if (td->terminate)
+ return 1;
io_u = malloc(sizeof(*io_u));
memset(io_u, 0, sizeof(*io_u));
INIT_LIST_HEAD(&io_u->list);
INIT_LIST_HEAD(&td->io_hist_list);
td->io_hist_tree = RB_ROOT;
+ td_set_runstate(td, TD_INITIALIZED);
+ fio_sem_up(startup_sem);
+ fio_sem_down(td->mutex);
+
+ /*
+ * the ->mutex semaphore is now no longer used, close it to avoid
+ * eating a file descriptor
+ */
+ fio_sem_remove(td->mutex);
+
if (init_io_u(td))
- goto err_sem;
+ goto err;
if (fio_setaffinity(td) == -1) {
td_verror(td, errno, "cpu_set_affinity");
- goto err_sem;
+ goto err;
}
if (init_iolog(td))
- goto err_sem;
+ goto err;
if (td->ioprio) {
if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
td_verror(td, errno, "ioprio_set");
- goto err_sem;
+ goto err;
}
}
if (nice(td->o.nice) == -1) {
td_verror(td, errno, "nice");
- goto err_sem;
+ goto err;
}
if (td->o.ioscheduler && switch_ioscheduler(td))
- goto err_sem;
-
- td_set_runstate(td, TD_INITIALIZED);
- fio_sem_up(startup_sem);
- fio_sem_down(td->mutex);
-
- /*
- * the ->mutex semaphore is now no longer used, close it to avoid
- * eating a file descriptor
- */
- fio_sem_remove(td->mutex);
+ goto err;
if (!td->o.create_serialize && setup_files(td))
goto err;
options_mem_free(td);
td_set_runstate(td, TD_EXITED);
return (void *) (unsigned long) td->error;
-err_sem:
- fio_sem_up(startup_sem);
- goto err;
}
/*