Change IO engine queuing

[fio.git] / engines / sg.c

diff --git a/engines/sg.c b/engines/sg.c
index 8d086bffe6cad7431cd9243932538d735e133cfa..27139760ba5bd14354c0e8a6e8c5bec666938463 100644 (file)
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -48,21 +48,6 @@ static void sgio_hdr_init(struct sgio_data *sd, struct sg_io_hdr *hdr,
        }
 }
 
        }
 }
 

-static int fio_sgio_ioctl_getevents(struct thread_data *td, int fio_unused min,
-                                   int max, struct timespec fio_unused *t)
-{
-       assert(max <= 1);
-
-       /*
-        * we can only have one finished io_u for sync io, since the depth
-        * is always 1
-        */
-       if (list_empty(&td->io_u_busylist))
-               return 0;
-
-       return 1;
-}
-

 static int pollin_events(struct pollfd *pfds, int fds)
 {
        int i;
 static int pollin_events(struct pollfd *pfds, int fds)
 {
        int i;


@@ -171,10 +156,15 @@ static int fio_sgio_ioctl_doio(struct thread_data *td,
 {
        struct sgio_data *sd = td->io_ops->data;
        struct sg_io_hdr *hdr = &io_u->hdr;
 {
        struct sgio_data *sd = td->io_ops->data;
        struct sg_io_hdr *hdr = &io_u->hdr;

+       int ret;

 
        sd->events[0] = io_u;
 
 
        sd->events[0] = io_u;
 

-       return ioctl(f->fd, SG_IO, hdr);
+       ret = ioctl(f->fd, SG_IO, hdr);
+       if (ret < 0)
+               return ret;
+
+       return FIO_Q_COMPLETED;

 }
 
 static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
 }
 
 static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)


@@ -190,9 +180,10 @@ static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
                ret = read(f->fd, hdr, sizeof(*hdr));
                if (ret < 0)
                        return errno;
                ret = read(f->fd, hdr, sizeof(*hdr));
                if (ret < 0)
                        return errno;

+               return FIO_Q_COMPLETED;

        }
 
        }
 

-       return 0;
+       return FIO_Q_QUEUED;

 }
 
 static int fio_sgio_doio(struct thread_data *td, struct io_u *io_u, int sync)
 }
 
 static int fio_sgio_doio(struct thread_data *td, struct io_u *io_u, int sync)


@@ -263,10 +254,10 @@ static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
 
        if (io_u->error) {
                td_verror(td, io_u->error);
 
        if (io_u->error) {
                td_verror(td, io_u->error);

-               return io_u->error;
+               return FIO_Q_COMPLETED;

        }
 
        }
 

-       return 0;
+       return ret;

 }
 
 static struct io_u *fio_sgio_event(struct thread_data *td, int event)
 }
 
 static struct io_u *fio_sgio_event(struct thread_data *td, int event)


@@ -369,10 +360,10 @@ static int fio_sgio_init(struct thread_data *td)
 
        sd->bs = bs;
 
 
        sd->bs = bs;
 

-       if (td->filetype == FIO_TYPE_BD)
-               td->io_ops->getevents = fio_sgio_ioctl_getevents;
-       else
-               td->io_ops->getevents = fio_sgio_getevents;
+       if (td->filetype == FIO_TYPE_BD) {
+               td->io_ops->getevents = NULL;
+               td->io_ops->event = NULL;
+       }

 
        /*
         * we want to do it, regardless of whether odirect is set or not
 
        /*
         * we want to do it, regardless of whether odirect is set or not