[PATCH] Link in known io engines

[fio.git] / engines / fio-engine-splice.c

diff --git a/engines/fio-engine-splice.c b/engines/fio-engine-splice.c
index cb39b7225946fc55b618b8b65cf0bef8d2500de0..fa4a6ee1db21ff192d811f1a95dfacc05de35483 100644 (file)
--- a/engines/fio-engine-splice.c
+++ b/engines/fio-engine-splice.c
@@ -8,20 +8,17 @@
 #include <errno.h>
 #include <assert.h>
 #include <sys/poll.h>
 #include <errno.h>
 #include <assert.h>
 #include <sys/poll.h>

-#include "fio.h"
-#include "os.h"
+
+#include "../fio.h"
+#include "../os.h"
+
+#ifdef FIO_HAVE_SPLICE

 
 struct spliceio_data {
        struct io_u *last_io_u;
        int pipe[2];
 };
 
 
 struct spliceio_data {
        struct io_u *last_io_u;
        int pipe[2];
 };
 

-static int fio_spliceio_sync(struct thread_data fio_unused *td,
-                            struct fio_file *f)
-{
-       return fsync(f->fd);
-}
-

 static int fio_spliceio_getevents(struct thread_data *td, int fio_unused min,
                                  int max, struct timespec fio_unused *t)
 {
 static int fio_spliceio_getevents(struct thread_data *td, int fio_unused min,
                                  int max, struct timespec fio_unused *t)
 {


@@ -135,14 +132,16 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops->data;
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops->data;

-       int ret;
+       unsigned int ret;

 
        if (io_u->ddir == DDIR_READ)
                ret = fio_splice_read(td, io_u);
 
        if (io_u->ddir == DDIR_READ)
                ret = fio_splice_read(td, io_u);

-       else
+       else if (io_u->ddir == DDIR_WRITE)

                ret = fio_splice_write(td, io_u);
                ret = fio_splice_write(td, io_u);

+       else
+               ret = fsync(io_u->file->fd);

 
 

-       if ((unsigned int) ret != io_u->buflen) {
+       if (ret != io_u->buflen) {

                if (ret > 0) {
                        io_u->resid = io_u->buflen - ret;
                        io_u->error = ENODATA;
                if (ret > 0) {
                        io_u->resid = io_u->buflen - ret;
                        io_u->error = ENODATA;


@@ -183,7 +182,7 @@ static int fio_spliceio_init(struct thread_data *td)
        return 0;
 }
 
        return 0;
 }
 

-struct ioengine_ops ioengine = {
+static struct ioengine_ops ioengine = {

        .name           = "splice",
        .version        = FIO_IOOPS_VERSION,
        .init           = fio_spliceio_init,
        .name           = "splice",
        .version        = FIO_IOOPS_VERSION,
        .init           = fio_spliceio_init,


@@ -191,6 +190,36 @@ struct ioengine_ops ioengine = {
        .getevents      = fio_spliceio_getevents,
        .event          = fio_spliceio_event,
        .cleanup        = fio_spliceio_cleanup,
        .getevents      = fio_spliceio_getevents,
        .event          = fio_spliceio_event,
        .cleanup        = fio_spliceio_cleanup,

-       .sync           = fio_spliceio_sync,

        .flags          = FIO_SYNCIO,
 };
        .flags          = FIO_SYNCIO,
 };

+
+#else /* FIO_HAVE_SPLICE */
+
+/*
+ * When we have a proper configure system in place, we simply wont build
+ * and install this io engine. For now install a crippled version that
+ * just complains and fails to load.
+ */
+static int fio_spliceio_init(struct thread_data fio_unused *td)
+{
+       fprintf(stderr, "fio: splice not available\n");
+       return 1;
+}
+
+static struct ioengine_ops ioengine = {
+       .name           = "splice",
+       .version        = FIO_IOOPS_VERSION,
+       .init           = fio_spliceio_init,
+};
+
+#endif
+
+static void fio_init fio_spliceio_register(void)
+{
+       register_ioengine(&ioengine);
+}
+
+static void fio_exit fio_spliceio_unregister(void)
+{
+       unregister_ioengine(&ioengine);
+}