The following changes since commit 1953e1adb5a28ed21370e85991d7f5c3cdc699f3: Merge branch 'flags-fix' of https://github.com/albertofaria/fio (2022-03-15 17:21:41 -0600) are available in the Git repository at: git://git.kernel.dk/fio.git master for you to fetch changes up to c822572d68e326384ce179b9484de0e4abf3d514: engines/null: use correct -include (2022-03-20 09:31:20 -0600) ---------------------------------------------------------------- Jens Axboe (3): engines/null: update external engine compilation Merge branch 'master' of https://github.com/jnoc/fio engines/null: use correct -include Jonathon Carter (1): Added citation.cff for easy APA/BibTeX citation directly from the Github repository CITATION.cff | 11 +++++++++++ engines/null.c | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 CITATION.cff --- Diff of recent changes: diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..3df315e5 --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,11 @@ +cff-version: 1.2.0 +preferred-citation: + type: software + authors: + - family-names: "Axboe" + given-names: "Jens" + email: axboe@xxxxxxxxx + title: "Flexible I/O Tester" + year: 2022 + url: "https://github.com/axboe/fio"; +licence: GNU GPL v2.0 diff --git a/engines/null.c b/engines/null.c index 4cc0102b..8dcd1b21 100644 --- a/engines/null.c +++ b/engines/null.c @@ -6,7 +6,8 @@ * * It also can act as external C++ engine - compiled with: * - * g++ -O2 -g -shared -rdynamic -fPIC -o cpp_null null.c -DFIO_EXTERNAL_ENGINE + * g++ -O2 -g -shared -rdynamic -fPIC -o cpp_null null.c \ + * -include ../config-host.h -DFIO_EXTERNAL_ENGINE * * to test it execute: * @@ -201,7 +202,7 @@ struct NullData { return null_commit(td, impl_); } - int fio_null_queue(struct thread_data *td, struct io_u *io_u) + fio_q_status fio_null_queue(struct thread_data *td, struct io_u *io_u) { return null_queue(td, impl_, io_u); } @@ -233,7 +234,7 @@ static int fio_null_commit(struct thread_data *td) return NullData::get(td)->fio_null_commit(td); } -static int fio_null_queue(struct thread_data *td, struct io_u *io_u) +static fio_q_status fio_null_queue(struct thread_data *td, struct io_u *io_u) { return NullData::get(td)->fio_null_queue(td, io_u); }
