X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fnull.c;h=bf7885e92187e68488c3c5109ca52ed77cd4fd36;hp=823d40def272c820a2d635b994483af94a61b014;hb=f0c48a70c5cb8e9f04d263999e0b8d9188f08562;hpb=07eb79dfa0e3801875d1c2907cfdb5da7c9d2cb3;ds=sidebyside diff --git a/engines/null.c b/engines/null.c index 823d40de..bf7885e9 100644 --- a/engines/null.c +++ b/engines/null.c @@ -26,8 +26,9 @@ static struct io_u *fio_null_event(struct thread_data *td, int event) return nd->io_us[event]; } -static int fio_null_getevents(struct thread_data *td, int min_events, - int fio_unused max, struct timespec fio_unused *t) +static int fio_null_getevents(struct thread_data *td, unsigned int min_events, + unsigned int fio_unused max, + struct timespec fio_unused *t) { struct null_data *nd = td->io_ops->data; int ret = 0; @@ -45,6 +46,7 @@ static int fio_null_commit(struct thread_data *td) struct null_data *nd = td->io_ops->data; if (!nd->events) { + io_u_mark_submit(td, nd->queued); nd->events = nd->queued; nd->queued = 0; } @@ -52,10 +54,12 @@ static int fio_null_commit(struct thread_data *td) return 0; } -static int fio_null_queue(struct thread_data fio_unused *td, struct io_u *io_u) +static int fio_null_queue(struct thread_data *td, struct io_u *io_u) { struct null_data *nd = td->io_ops->data; + fio_ro_check(td, io_u); + if (td->io_ops->flags & FIO_SYNCIO) return FIO_Q_COMPLETED; if (nd->events) @@ -79,7 +83,6 @@ static void fio_null_cleanup(struct thread_data *td) if (nd->io_us) free(nd->io_us); free(nd); - td->io_ops->data = NULL; } }