Add support for queuing > 1 command at the time

[fio.git] / engines / sg.c

diff --git a/engines/sg.c b/engines/sg.c
index 6c997bd47cad75523582ea77bc7da454396c69f0..f955c20a74ca770f3a69b6d06361e0ca0cb3c485 100644 (file)
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -22,6 +22,9 @@ struct sgio_cmd {
 struct sgio_data {
        struct sgio_cmd *cmds;
        struct io_u **events;
+       struct pollfd *pfds;
+       int *fd_flags;
+       void *sgbuf;
        unsigned int bs;
 };
 
@@ -45,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;
@@ -80,29 +68,24 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
         */
        struct fio_file *f = &td->files[0];
        struct sgio_data *sd = td->io_ops->data;
-       int left = max, ret, events, i, r = 0, *fl;
-       struct pollfd *pfds;
-       void *buf;
+       int left = max, ret, events, i, r = 0;
+       void *buf = sd->sgbuf;
 
        /*
         * Fill in the file descriptors
         */
-       pfds = malloc(sizeof(struct pollfd) * td->nr_files);
-       fl = malloc(sizeof(int) * td->nr_files);
-
        for_each_file(td, f, i) {
                /*
                 * don't block for min events == 0
                 */
                if (!min) {
-                       fl[i] = fcntl(f->fd, F_GETFL);
-                       fcntl(f->fd, F_SETFL, fl[i] | O_NONBLOCK);
+                       sd->fd_flags[i] = fcntl(f->fd, F_GETFL);
+                       fcntl(f->fd, F_SETFL, sd->fd_flags[i] | O_NONBLOCK);
                }
-               pfds[i].fd = f->fd;
-               pfds[i].events = POLLIN;
+               sd->pfds[i].fd = f->fd;
+               sd->pfds[i].events = POLLIN;
        }
 
-       buf = malloc(max * sizeof(struct sg_io_hdr));
        while (left) {
                void *p;
 
@@ -110,16 +93,16 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
                        if (!min)
                                break;
 
-                       ret = poll(pfds, td->nr_files, -1);
+                       ret = poll(sd->pfds, td->nr_files, -1);
                        if (ret < 0) {
-                               td_verror(td, errno);
                                if (!r)
-                                       r = -1;
+                                       r = -errno;
+                               td_verror(td, errno);
                                break;
                        } else if (!ret)
                                continue;
 
-                       if (pollin_events(pfds, td->nr_files))
+                       if (pollin_events(sd->pfds, td->nr_files))
                                break;
                } while (1);
 
@@ -134,8 +117,8 @@ re_read:
                        if (ret < 0) {
                                if (errno == EAGAIN)
                                        continue;
+                               r = -errno;
                                td_verror(td, errno);
-                               r = -1;
                                break;
                        } else if (ret) {
                                p += ret;
@@ -162,12 +145,9 @@ re_read:
 
        if (!min) {
                for_each_file(td, f, i)
-                       fcntl(f->fd, F_SETFL, fl[i]);
+                       fcntl(f->fd, F_SETFL, sd->fd_flags[i]);
        }
 
-       free(buf);
-       free(pfds);
-       free(fl);
        return r;
 }
 
@@ -176,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;
+       int ret;
 
        sd->events[0] = io_u;
 
-       return ioctl(f->fd, SG_IO, hdr);
+       ret = ioctl(f->fd, SG_IO, hdr);
+       if (ret < 0)
+               return -errno;
+
+       return FIO_Q_COMPLETED;
 }
 
 static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
@@ -194,10 +179,11 @@ static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
        if (sync) {
                ret = read(f->fd, hdr, sizeof(*hdr));
                if (ret < 0)
-                       return errno;
+                       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)
@@ -266,7 +252,12 @@ static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
                io_u->error = EIO;
        }
 
-       return io_u->error;
+       if (io_u->error) {
+               td_verror(td, io_u->error);
+               return FIO_Q_COMPLETED;
+       }
+
+       return ret;
 }
 
 static struct io_u *fio_sgio_event(struct thread_data *td, int event)
@@ -310,8 +301,16 @@ static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
 
 static void fio_sgio_cleanup(struct thread_data *td)
 {
-       if (td->io_ops->data) {
-               free(td->io_ops->data);
+       struct sgio_data *sd = td->io_ops->data;
+
+       if (sd) {
+               free(sd->events);
+               free(sd->cmds);
+               free(sd->fd_flags);
+               free(sd->pfds);
+               free(sd->sgbuf);
+               free(sd);
+
                td->io_ops->data = NULL;
        }
 }
@@ -329,6 +328,13 @@ static int fio_sgio_init(struct thread_data *td)
        memset(sd->cmds, 0, td->iodepth * sizeof(struct sgio_cmd));
        sd->events = malloc(td->iodepth * sizeof(struct io_u *));
        memset(sd->events, 0, td->iodepth * sizeof(struct io_u *));
+       sd->pfds = malloc(sizeof(struct pollfd) * td->nr_files);
+       memset(sd->pfds, 0, sizeof(struct pollfd) * td->nr_files);
+       sd->fd_flags = malloc(sizeof(int) * td->nr_files);
+       memset(sd->fd_flags, 0, sizeof(int) * td->nr_files);
+       sd->sgbuf = malloc(sizeof(struct sg_io_hdr) * td->iodepth);
+       memset(sd->sgbuf, 0, sizeof(struct sg_io_hdr) * td->iodepth);
+
        td->io_ops->data = sd;
 
        if (td->filetype == FIO_TYPE_BD) {
@@ -354,10 +360,10 @@ static int fio_sgio_init(struct thread_data *td)
 
        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
@@ -367,6 +373,9 @@ static int fio_sgio_init(struct thread_data *td)
 err:
        free(sd->events);
        free(sd->cmds);
+       free(sd->fd_flags);
+       free(sd->pfds);
+       free(sd->sgbuf);
        free(sd);
        td->io_ops->data = NULL;
        return 1;