for_each_td(td, i) {
if (group_id == TERMINATE_ALL || groupid == td->groupid) {
- /*
- * if the thread is running, just let it exit
- */
- if (td->runstate < TD_RUNNING)
+ if (td->runstate <= TD_RUNNING)
kill(td->pid, SIGQUIT);
td->terminate = 1;
td->o.start_delay = 0;
ret = -io_u->error;
else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
+ struct fio_file *f = io_u->file;
/*
* zero read, fail
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->offset += bytes;
+ f->last_completed_pos = io_u->offset;
+
+ td->ts.short_io_u[io_u->ddir]++;
- if (io_u->offset == io_u->file->real_file_size)
+ if (io_u->offset == f->real_file_size)
goto sync_done;
requeue_io_u(td, &io_u);
ret = -io_u->error;
else if (io_u->resid) {
int bytes = io_u->xfer_buflen - io_u->resid;
+ struct fio_file *f = io_u->file;
/*
* zero read, fail
io_u->xfer_buflen = io_u->resid;
io_u->xfer_buf += bytes;
io_u->offset += bytes;
+ f->last_completed_pos = io_u->offset;
- if (io_u->offset == io_u->file->real_file_size)
+ td->ts.short_io_u[io_u->ddir]++;
+
+ if (io_u->offset == f->real_file_size)
goto sync_done;
requeue_io_u(td, &io_u);
INIT_LIST_HEAD(&io_u->list);
io_u->buf = p + max_bs * i;
- if (td_write(td) || td_rw(td))
+ if (td_write(td))
fill_rand_buf(io_u, max_bs);
io_u->index = i;
f = fopen(tmp, "r+");
if (!f) {
- td_verror(td, errno, "fopen");
+ if (errno == ENOENT) {
+ log_err("fio: os or kernel doesn't support IO scheduler switching\n");
+ return 0;
+ }
+ td_verror(td, errno, "fopen iosched");
return 1;
}
/*
* thread is not dead, continue
*/
+ pending++;
continue;
reaped:
if (td->o.use_thread) {
(*nr_running)--;
(*m_rate) -= td->o.ratemin;
(*t_rate) -= td->o.rate;
+ pending--;
if (td->error)
exit_value++;