X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=d345064d392111e50accdb70db9fe2d43f45ab09;hp=792d44228c694fb95e49f347a8ecb1605cd10e97;hb=f63f7f3bbc49c72ee06f351bf3a7312df32f9e3c;hpb=47f0cc48db34b37d81540b31bf6adf11bb7b578d diff --git a/fio.c b/fio.c index 792d4422..d345064d 100644 --- a/fio.c +++ b/fio.c @@ -49,7 +49,7 @@ int nr_thread = 0; int shm_id = 0; int temp_stall_ts; -static struct fio_sem *startup_sem; +static struct fio_mutex *startup_mutex; static volatile int fio_abort; static int exit_value; @@ -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,22 @@ 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 { + struct ioengine_ops *ops = td->io_ops; + + if (ops && (ops->flags & FIO_SIGQUIT)) + kill(td->pid, SIGQUIT); + } } } } @@ -446,6 +457,13 @@ static void do_io(struct thread_data *td) break; } + /* + * Add verification end_io handler, if asked to verify + * a previously written file. + */ + if (td->o.verify != VERIFY_NONE) + io_u->end_io = verify_io_u; + ret = td_io_queue(td, io_u); switch (ret) { case FIO_Q_COMPLETED: @@ -561,6 +579,10 @@ sync_done: } } + if (td->o.fill_device && td->error == ENOSPC) { + td->error = 0; + td->terminate = 1; + } if (!td->error) { struct fio_file *f; @@ -579,6 +601,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) @@ -619,11 +647,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; @@ -650,10 +674,12 @@ static int init_io_u(struct thread_data *td) memset(io_u, 0, sizeof(*io_u)); INIT_LIST_HEAD(&io_u->list); - io_u->buf = p + max_bs * i; + if (!(td->io_ops->flags & FIO_NOIO)) { + io_u->buf = p + max_bs * i; - if (td_write(td)) - fill_io_buf(td, io_u, max_bs); + if (td_write(td)) + fill_io_buf(td, io_u, max_bs); + } io_u->index = i; io_u->flags = IO_U_F_FREE; @@ -755,7 +781,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) @@ -778,9 +807,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) @@ -788,6 +816,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); @@ -796,14 +826,14 @@ static void *thread_main(void *data) td->io_hist_tree = RB_ROOT; td_set_runstate(td, TD_INITIALIZED); - fio_sem_up(startup_sem); - fio_sem_down(td->mutex); + fio_mutex_up(startup_mutex); + fio_mutex_down(td->mutex); /* - * the ->mutex semaphore is now no longer used, close it to avoid + * the ->mutex mutex is now no longer used, close it to avoid * eating a file descriptor */ - fio_sem_remove(td->mutex); + fio_mutex_remove(td->mutex); /* * May alter parameters that init_io_u() will use, so we need to @@ -820,7 +850,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; @@ -894,7 +924,9 @@ static void *thread_main(void *data) if (td->error || td->terminate) break; - if (td->o.verify == VERIFY_NONE) + if (!td->o.do_verify || + td->o.verify == VERIFY_NONE || + (td->io_ops->flags & FIO_UNIDIR)) continue; if (clear_io_state(td)) @@ -978,12 +1010,12 @@ static int fork_main(int shmid, int offset) static void reap_threads(int *nr_running, int *t_rate, int *m_rate) { struct thread_data *td; - int i, cputhreads, pending, status, ret; + int i, cputhreads, realthreads, pending, status, ret; /* * reap exited threads (TD_EXITED -> TD_REAPED) */ - pending = cputhreads = 0; + realthreads = pending = cputhreads = 0; for_each_td(td, i) { int flags = 0; @@ -993,8 +1025,14 @@ static void reap_threads(int *nr_running, int *t_rate, int *m_rate) */ if (td->io_ops && !strcmp(td->io_ops->name, "cpuio")) cputhreads++; + else + realthreads++; - if (!td->pid || td->runstate == TD_REAPED) + if (!td->pid) { + pending++; + continue; + } + if (td->runstate == TD_REAPED) continue; if (td->o.use_thread) { if (td->runstate == TD_EXITED) { @@ -1046,8 +1084,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)--; @@ -1059,7 +1100,7 @@ reaped: exit_value++; } - if (*nr_running == cputhreads && !pending) + if (*nr_running == cputhreads && !pending && realthreads) terminate_threads(TERMINATE_ALL); } @@ -1162,19 +1203,21 @@ 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); exit(ret); } } - fio_sem_down(startup_sem); + fio_mutex_down(startup_mutex); } /* @@ -1229,7 +1272,7 @@ static void run_threads(void) m_rate += td->o.ratemin; t_rate += td->o.rate; todo--; - fio_sem_up(td->mutex); + fio_mutex_up(td->mutex); } reap_threads(&nr_running, &t_rate, &m_rate); @@ -1278,7 +1321,7 @@ int main(int argc, char *argv[]) setup_log(&agg_io_log[DDIR_WRITE]); } - startup_sem = fio_sem_init(0); + startup_mutex = fio_mutex_init(0); set_genesis_time(); @@ -1294,6 +1337,6 @@ int main(int argc, char *argv[]) } } - fio_sem_remove(startup_sem); + fio_mutex_remove(startup_mutex); return exit_value; }