/*
* 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
}
if (td->cur_depth)
- io_u_queued_complete(td, td->cur_depth, NULL);
+ r = io_u_queued_complete(td, td->cur_depth, NULL);
}
/*
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;
* 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:
* completed io_u's first.
*/
min_events = 0;
- if (queue_full(td) || ret == FIO_Q_BUSY)
+ 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);
*/
if (ret == FIO_Q_QUEUED || ret == FIO_Q_BUSY) {
min_evts = 0;
- if (queue_full(td) || ret == FIO_Q_BUSY)
+ 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)
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;
}
/*