X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=backend.c;h=a2a6cec2ce267769a0a08891fe58dd60f807e2af;hb=09400a60042ed1d665ab07c9363ffb1591595ed8;hp=b40a3ce7849b51774ea775081fd348cf3f7a2cf3;hpb=80ea26a889322d7c695bd6f1b1495b3ba94d4d2e;p=fio.git diff --git a/backend.c b/backend.c index b40a3ce7..a2a6cec2 100644 --- a/backend.c +++ b/backend.c @@ -54,9 +54,9 @@ #include "lib/getrusage.h" #include "idletime.h" #include "err.h" -#include "lib/tp.h" #include "workqueue.h" #include "lib/mountcheck.h" +#include "rate-submit.h" static pthread_t helper_thread; static pthread_mutex_t helper_lock; @@ -934,13 +934,10 @@ static uint64_t do_io(struct thread_data *td) if (td->error) break; - ret = workqueue_enqueue(&td->io_wq, &io_u->work); - if (ret) - ret = FIO_Q_QUEUED; - else - ret = FIO_Q_BUSY; + workqueue_enqueue(&td->io_wq, &io_u->work); + ret = FIO_Q_QUEUED; - if (ret == FIO_Q_QUEUED && ddir_rw(ddir)) { + if (ddir_rw(ddir)) { td->io_issues[ddir]++; td->io_issue_bytes[ddir] += blen; td->rate_io_issue_bytes[ddir] += blen; @@ -977,7 +974,7 @@ reap: if (!in_ramp_time(td) && should_check_rate(td)) { if (check_min_rate(td, &comp_time)) { - if (exitall_on_terminate) + if (exitall_on_terminate || td->o.exitall_error) fio_terminate_threads(td->groupid); td_verror(td, EIO, "check_min_rate"); break; @@ -1361,146 +1358,6 @@ static uint64_t do_dry_run(struct thread_data *td) return td->bytes_done[DDIR_WRITE] + td->bytes_done[DDIR_TRIM]; } -static void io_workqueue_fn(struct submit_worker *sw, - struct workqueue_work *work) -{ - struct io_u *io_u = container_of(work, struct io_u, work); - const enum fio_ddir ddir = io_u->ddir; - struct thread_data *td = sw->private; - int ret; - - dprint(FD_RATE, "io_u %p queued by %u\n", io_u, gettid()); - - io_u_set(io_u, IO_U_F_NO_FILE_PUT); - - td->cur_depth++; - - do { - ret = td_io_queue(td, io_u); - if (ret != FIO_Q_BUSY) - break; - ret = io_u_queued_complete(td, 1); - if (ret > 0) - td->cur_depth -= ret; - io_u_clear(io_u, IO_U_F_FLIGHT); - } while (1); - - dprint(FD_RATE, "io_u %p ret %d by %u\n", io_u, ret, gettid()); - - io_queue_event(td, io_u, &ret, ddir, NULL, 0, NULL); - - if (ret == FIO_Q_COMPLETED) - td->cur_depth--; - else if (ret == FIO_Q_QUEUED) { - unsigned int min_evts; - - if (td->o.iodepth == 1) - min_evts = 1; - else - min_evts = 0; - - ret = io_u_queued_complete(td, min_evts); - if (ret > 0) - td->cur_depth -= ret; - } else if (ret == FIO_Q_BUSY) { - ret = io_u_queued_complete(td, td->cur_depth); - if (ret > 0) - td->cur_depth -= ret; - } -} - -static bool io_workqueue_pre_sleep_flush_fn(struct submit_worker *sw) -{ - struct thread_data *td = sw->private; - - if (td->io_u_queued || td->cur_depth || td->io_u_in_flight) - return true; - - return false; -} - -static void io_workqueue_pre_sleep_fn(struct submit_worker *sw) -{ - struct thread_data *td = sw->private; - int ret; - - ret = io_u_quiesce(td); - if (ret > 0) - td->cur_depth -= ret; -} - -static int io_workqueue_alloc_fn(struct submit_worker *sw) -{ - struct thread_data *td; - - td = calloc(1, sizeof(*td)); - sw->private = td; - return 0; -} - -static void io_workqueue_free_fn(struct submit_worker *sw) -{ - free(sw->private); - sw->private = NULL; -} - -static int io_workqueue_init_worker_fn(struct submit_worker *sw) -{ - struct thread_data *parent = sw->wq->td; - struct thread_data *td = sw->private; - int fio_unused ret; - - memcpy(&td->o, &parent->o, sizeof(td->o)); - memcpy(&td->ts, &parent->ts, sizeof(td->ts)); - td->o.uid = td->o.gid = -1U; - dup_files(td, parent); - td->eo = parent->eo; - fio_options_mem_dupe(td); - - if (ioengine_load(td)) - goto err; - - if (td->o.odirect) - td->io_ops->flags |= FIO_RAWIO; - - td->pid = gettid(); - - INIT_FLIST_HEAD(&td->io_log_list); - INIT_FLIST_HEAD(&td->io_hist_list); - INIT_FLIST_HEAD(&td->verify_list); - INIT_FLIST_HEAD(&td->trim_list); - INIT_FLIST_HEAD(&td->next_rand_list); - td->io_hist_tree = RB_ROOT; - - td->o.iodepth = 1; - if (td_io_init(td)) - goto err_io_init; - - fio_gettime(&td->epoch, NULL); - fio_getrusage(&td->ru_start); - clear_io_state(td, 1); - - td_set_runstate(td, TD_RUNNING); - td->flags |= TD_F_CHILD; - td->parent = parent; - return 0; - -err_io_init: - close_ioengine(td); -err: - return 1; - -} - -struct workqueue_ops rated_wq_ops = { - .fn = io_workqueue_fn, - .pre_sleep_flush_fn = io_workqueue_pre_sleep_flush_fn, - .pre_sleep_fn = io_workqueue_pre_sleep_fn, - .alloc_worker_fn = io_workqueue_alloc_fn, - .free_worker_fn = io_workqueue_free_fn, - .init_worker_fn = io_workqueue_init_worker_fn, -}; - /* * Entry point for the thread based jobs. The process based jobs end up * here as well, after a little setup. @@ -1693,13 +1550,12 @@ static void *thread_main(void *data) goto err; } - if (td->flags & TD_F_COMPRESS_LOG) - tp_init(&td->tp_data); + if (iolog_compress_init(td)) + goto err; fio_verify_init(td); - if ((o->io_submit_mode == IO_MODE_OFFLOAD) && - workqueue_init(td, &td->io_wq, &rated_wq_ops, td->o.iodepth)) + if (rate_submit_init(td)) goto err; fio_gettime(&td->epoch, NULL); @@ -1731,8 +1587,11 @@ static void *thread_main(void *data) if (td->o.verify_only && (td_write(td) || td_rw(td))) verify_bytes = do_dry_run(td); - else + else { verify_bytes = do_io(td); + if (!verify_bytes) + fio_mark_td_terminate(td); + } clear_state = 1; @@ -1797,16 +1656,13 @@ static void *thread_main(void *data) fio_writeout_logs(td); - if (o->io_submit_mode == IO_MODE_OFFLOAD) - workqueue_exit(&td->io_wq); - - if (td->flags & TD_F_COMPRESS_LOG) - tp_exit(&td->tp_data); + iolog_compress_exit(td); + rate_submit_exit(td); if (o->exec_postrun) exec_string(o, o->exec_postrun, (const char *)"postrun"); - if (exitall_on_terminate) + if (exitall_on_terminate || (o->exitall_error && td->error)) fio_terminate_threads(td->groupid); err: @@ -2261,7 +2117,7 @@ reap: *fio_debug_jobp = pid; } dprint(FD_MUTEX, "wait on startup_mutex\n"); - if (fio_mutex_down_timeout(startup_mutex, 10)) { + if (fio_mutex_down_timeout(startup_mutex, 10000)) { log_err("fio: job startup hung? exiting.\n"); fio_terminate_threads(TERMINATE_ALL); fio_abort = 1;