return 0;
}
-static struct fio_file *get_next_file(struct thread_data *td)
-{
- unsigned int old_next_file = td->next_file;
- struct fio_file *f;
-
- do {
- f = &td->files[td->next_file];
-
- td->next_file++;
- if (td->next_file >= td->nr_files)
- td->next_file = 0;
-
- if (f->fd != -1)
- break;
-
- f = NULL;
- } while (td->next_file != old_next_file);
-
- return f;
-}
-
/*
* When job exits, we can cancel the in-flight IO if we are using async
* io. Attempt to do so.
/*
* get immediately available events, if any
*/
- io_u_queued_complete(td, 0, NULL);
+ r = io_u_queued_complete(td, 0, NULL);
+ if (r < 0)
+ return;
/*
* now cancel remaining active events
list_for_each_safe(entry, n, &td->io_u_busylist) {
io_u = list_entry(entry, struct io_u, list);
- r = td->io_ops->cancel(td, io_u);
- if (!r)
+ /*
+ * if the io_u isn't in flight, then that generally
+ * means someone leaked an io_u. complain but fix
+ * it up, so we don't stall here.
+ */
+ if ((io_u->flags & IO_U_F_FLIGHT) == 0) {
+ log_err("fio: non-busy IO on busy list\n");
put_io_u(td, io_u);
+ } else {
+ r = td->io_ops->cancel(td, io_u);
+ if (!r)
+ put_io_u(td, io_u);
+ }
}
}
if (td->cur_depth)
- io_u_queued_complete(td, td->cur_depth, NULL);
+ r = io_u_queued_complete(td, td->cur_depth, NULL);
}
/*
return 1;
}
+requeue:
ret = td_io_queue(td, io_u);
if (ret < 0) {
td_verror(td, io_u->error);
put_io_u(td, io_u);
return 1;
} else if (ret == FIO_Q_QUEUED) {
- if (io_u_queued_complete(td, 1, NULL))
+ if (io_u_queued_complete(td, 1, NULL) < 0)
return 1;
} else if (ret == FIO_Q_COMPLETED) {
if (io_u->error) {
return 1;
}
- io_u_sync_complete(td, io_u, NULL);
+ if (io_u_sync_complete(td, io_u, NULL) < 0)
+ return 1;
+ } else if (ret == FIO_Q_BUSY) {
+ if (td_io_commit(td))
+ return 1;
+ goto requeue;
}
return 0;
* read from disk.
*/
for_each_file(td, f, i) {
- fio_io_sync(td, f);
- file_invalidate_cache(td, f);
+ if (fio_io_sync(td, f))
+ break;
+ if (file_invalidate_cache(td, f))
+ break;
}
+ if (td->error)
+ return;
+
td_set_runstate(td, TD_VERIFYING);
io_u = NULL;
if (!io_u)
break;
- if (runtime_exceeded(td, &io_u->start_time))
+ if (runtime_exceeded(td, &io_u->start_time)) {
+ put_io_u(td, io_u);
break;
+ }
- if (get_next_verify(td, io_u))
+ if (get_next_verify(td, io_u)) {
+ put_io_u(td, io_u);
break;
+ }
- if (td_io_prep(td, io_u))
+ if (td_io_prep(td, io_u)) {
+ put_io_u(td, io_u);
break;
-
+ }
requeue:
ret = td_io_queue(td, io_u);
goto requeue;
}
ret = io_u_sync_complete(td, io_u, verify_io_u);
- if (ret)
+ if (ret < 0)
break;
continue;
case FIO_Q_QUEUED:
break;
+ case FIO_Q_BUSY:
+ requeue_io_u(td, &io_u);
+ ret = td_io_commit(td);
+ break;
default:
assert(ret < 0);
td_verror(td, -ret);
* completed io_u's first.
*/
min_events = 0;
- if (queue_full(td))
+ if (queue_full(td) || ret == FIO_Q_BUSY) {
min_events = 1;
+ if (td->cur_depth > td->iodepth_low)
+ min_events = td->cur_depth - td->iodepth_low;
+ }
+
/*
* 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))
+ if (io_u_queued_complete(td, min_events, verify_io_u) < 0)
break;
}
- if (io_u)
- put_io_u(td, io_u);
-
if (td->cur_depth)
cleanup_pending_aio(td);
{
struct timeval s;
unsigned long usec;
- struct fio_file *f;
int i, ret = 0;
td_set_runstate(td, TD_RUNNING);
if (td->terminate)
break;
- f = get_next_file(td);
- if (!f)
- break;
-
- io_u = get_io_u(td, f);
+ io_u = get_io_u(td);
if (!io_u)
break;
ret = bytes_done;
break;
case FIO_Q_QUEUED:
+ /*
+ * if the engine doesn't have a commit hook,
+ * the io_u is really queued. if it does have such
+ * a hook, it has to call io_u_queued() itself.
+ */
+ if (td->io_ops->commit == NULL)
+ io_u_queued(td, io_u);
+ break;
+ case FIO_Q_BUSY:
+ requeue_io_u(td, &io_u);
+ ret = td_io_commit(td);
break;
default:
assert(ret < 0);
if (ret < 0 || td->error)
break;
- add_slat_sample(td, io_u->ddir, mtime_since(&io_u->start_time, &io_u->issue_time));
-
/*
* See if we need to complete some commands
*/
- if (ret == FIO_Q_QUEUED) {
+ if (ret == FIO_Q_QUEUED || ret == FIO_Q_BUSY) {
min_evts = 0;
- if (queue_full(td))
+ if (queue_full(td) || ret == FIO_Q_BUSY) {
min_evts = 1;
+ if (td->cur_depth > td->iodepth_low)
+ min_evts = td->cur_depth - td->iodepth_low;
+ }
+
fio_gettime(&comp_time, NULL);
bytes_done = io_u_queued_complete(td, min_evts, NULL);
if (bytes_done < 0)
}
if (!td->error) {
+ struct fio_file *f;
+
if (td->cur_depth)
cleanup_pending_aio(td);
fill_rand_buf(io_u, max_bs);
io_u->index = i;
+ io_u->flags = IO_U_F_FREE;
list_add(&io_u->list, &td->io_u_freelist);
}
+ io_u_init_timeout();
+
return 0;
}
struct fio_file *f;
int i;
- td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0;
+ td->ts.stat_io_bytes[0] = td->ts.stat_io_bytes[1] = 0;
td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
td->zone_bytes = 0;
+ td->last_was_sync = 0;
+
for_each_file(td, f, i) {
+ f->last_completed_pos = 0;
+
f->last_pos = 0;
if (td->io_ops->flags & FIO_SYNCIO)
lseek(f->fd, SEEK_SET, 0);
INIT_LIST_HEAD(&td->io_u_freelist);
INIT_LIST_HEAD(&td->io_u_busylist);
+ INIT_LIST_HEAD(&td->io_u_requeues);
INIT_LIST_HEAD(&td->io_hist_list);
INIT_LIST_HEAD(&td->io_log_list);
}
fio_gettime(&td->epoch, NULL);
- getrusage(RUSAGE_SELF, &td->ru_start);
+ memcpy(&td->timeout_end, &td->epoch, sizeof(td->epoch));
+ getrusage(RUSAGE_SELF, &td->ts.ru_start);
runtime[0] = runtime[1] = 0;
while (td->loops--) {
fio_gettime(&td->start, NULL);
- memcpy(&td->stat_sample_time, &td->start, sizeof(td->start));
+ memcpy(&td->ts.stat_sample_time, &td->start, sizeof(td->start));
if (td->ratemin)
- memcpy(&td->lastrate, &td->stat_sample_time, sizeof(td->lastrate));
+ memcpy(&td->lastrate, &td->ts.stat_sample_time, sizeof(td->lastrate));
clear_io_state(td);
prune_io_piece_log(td);
td->runtime[0] = runtime[0] / 1000;
td->runtime[1] = runtime[1] / 1000;
- if (td->bw_log)
- finish_log(td, td->bw_log, "bw");
- if (td->slat_log)
- finish_log(td, td->slat_log, "slat");
- if (td->clat_log)
- finish_log(td, td->clat_log, "clat");
+ if (td->ts.bw_log)
+ finish_log(td, td->ts.bw_log, "bw");
+ if (td->ts.slat_log)
+ finish_log(td, td->ts.slat_log, "slat");
+ if (td->ts.clat_log)
+ finish_log(td, td->ts.clat_log, "clat");
if (td->write_iolog_file)
write_iolog_close(td);
if (td->exec_postrun) {
close_ioengine(td);
cleanup_io_u(td);
td_set_runstate(td, TD_EXITED);
- return (void *) td->error;
+ return (void *) (unsigned long) td->error;
}
/*
td = data + offset * sizeof(struct thread_data);
ret = thread_main(td);
shmdt(data);
- return (int) ret;
+ return (int) (unsigned long) ret;
}
/*
* check if someone quit or got killed in an unusual way
*/
ret = waitpid(td->pid, &status, WNOHANG);
- if (ret < 0)
+ if (ret < 0) {
+ if (errno == ECHILD) {
+ log_err("fio: pid=%d disappeared\n", td->pid);
+ td_set_runstate(td, TD_REAPED);
+ goto reaped;
+ }
perror("waitpid");
- else if ((ret == td->pid) && WIFSIGNALED(status)) {
+ } else if ((ret == td->pid) && WIFSIGNALED(status)) {
int sig = WTERMSIG(status);
log_err("fio: pid=%d, got signal=%d\n", td->pid, sig);
int status;
ret = waitpid(td->pid, &status, 0);
- if (ret < 0)
+ if (ret < 0) {
+ if (errno == ECHILD) {
+ log_err("fio: pid=%d disappeared\n", td->pid);
+ td_set_runstate(td, TD_REAPED);
+ goto reaped;
+ }
perror("waitpid");
- else if (WIFEXITED(status) && WEXITSTATUS(status)) {
+ } else if (WIFEXITED(status) && WEXITSTATUS(status)) {
if (!exit_value)
exit_value++;
}
projects / fio.git / blobdiff