pre_read fixes

[fio.git] / engines / sg.c

diff --git a/engines/sg.c b/engines/sg.c
index 98ecbd1c25a0ca52a003c85e75fe2090ee8a7433..39f99d8d0922050eb1a3aa3d60305cd865a09113 100644 (file)
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -1,5 +1,7 @@
 /*
 /*

- * scsi generic sg v3 io engine
+ * sg engine
+ *
+ * IO engine that uses the Linux SG v3 interface to talk to SCSI devices

  *
  */
 #include <stdio.h>
  *
  */
 #include <stdio.h>


@@ -10,7 +12,6 @@
 #include <sys/poll.h>
 
 #include "../fio.h"
 #include <sys/poll.h>
 
 #include "../fio.h"

-#include "../os.h"

 
 #ifdef FIO_HAVE_SGIO
 
 
 #ifdef FIO_HAVE_SGIO
 


@@ -60,18 +61,14 @@ static int pollin_events(struct pollfd *pfds, int fds)
        return 0;
 }
 
        return 0;
 }
 

-static int fio_sgio_getevents(struct thread_data *td, int min, int max,
-                             struct timespec fio_unused *t)
+static int fio_sgio_getevents(struct thread_data *td, unsigned int min,
+                             unsigned int max, struct timespec fio_unused *t)

 {
 {

-       /*
-        * normally hard coding &td->files[0] is a bug that needs to be fixed,
-        * but it's ok here as all files should point to the same device.
-        */
-       struct fio_file *f = &td->files[0];

        struct sgio_data *sd = td->io_ops->data;
        int left = max, ret, r = 0;
        void *buf = sd->sgbuf;
        unsigned int i, events;
        struct sgio_data *sd = td->io_ops->data;
        int left = max, ret, r = 0;
        void *buf = sd->sgbuf;
        unsigned int i, events;

+       struct fio_file *f;

 
        /*
         * Fill in the file descriptors
 
        /*
         * Fill in the file descriptors


@@ -95,7 +92,7 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
                        if (!min)
                                break;
 
                        if (!min)
                                break;
 

-                       ret = poll(sd->pfds, td->nr_files, -1);
+                       ret = poll(sd->pfds, td->o.nr_files, -1);

                        if (ret < 0) {
                                if (!r)
                                        r = -errno;
                        if (ret < 0) {
                                if (!r)
                                        r = -errno;


@@ -104,7 +101,7 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
                        } else if (!ret)
                                continue;
 
                        } else if (!ret)
                                continue;
 

-                       if (pollin_events(sd->pfds, td->nr_files))
+                       if (pollin_events(sd->pfds, td->o.nr_files))

                                break;
                } while (1);
 
                                break;
                } while (1);
 


@@ -164,7 +161,7 @@ static int fio_sgio_ioctl_doio(struct thread_data *td,
 
        ret = ioctl(f->fd, SG_IO, hdr);
        if (ret < 0)
 
        ret = ioctl(f->fd, SG_IO, hdr);
        if (ret < 0)

-               return -errno;
+               return ret;

 
        return FIO_Q_COMPLETED;
 }
 
        return FIO_Q_COMPLETED;
 }


@@ -176,12 +173,12 @@ static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
 
        ret = write(f->fd, hdr, sizeof(*hdr));
        if (ret < 0)
 
        ret = write(f->fd, hdr, sizeof(*hdr));
        if (ret < 0)

-               return errno;
+               return ret;

 
        if (sync) {
                ret = read(f->fd, hdr, sizeof(*hdr));
                if (ret < 0)
 
        if (sync) {
                ret = read(f->fd, hdr, sizeof(*hdr));
                if (ret < 0)

-                       return -errno;
+                       return ret;

                return FIO_Q_COMPLETED;
        }
 
                return FIO_Q_COMPLETED;
        }
 


@@ -245,6 +242,8 @@ static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
        struct sg_io_hdr *hdr = &io_u->hdr;
        int ret;
 
        struct sg_io_hdr *hdr = &io_u->hdr;
        int ret;
 

+       fio_ro_check(td, io_u);
+

        ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
 
        if (ret < 0)
        ret = fio_sgio_doio(td, io_u, io_u->ddir == DDIR_SYNC);
 
        if (ret < 0)


@@ -278,7 +277,7 @@ static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
        int ret;
 
        io_u = __get_io_u(td);
        int ret;
 
        io_u = __get_io_u(td);

-       io_u->file = &td->files[0];
+       io_u->file = td->files[0];

        assert(io_u);
 
        hdr = &io_u->hdr;
        assert(io_u);
 
        hdr = &io_u->hdr;


@@ -312,8 +311,6 @@ static void fio_sgio_cleanup(struct thread_data *td)
                free(sd->pfds);
                free(sd->sgbuf);
                free(sd);
                free(sd->pfds);
                free(sd->sgbuf);
                free(sd);

-
-               td->io_ops->data = NULL;

        }
 }
 
        }
 }
 


@@ -323,23 +320,23 @@ static int fio_sgio_init(struct thread_data *td)
 
        sd = malloc(sizeof(*sd));
        memset(sd, 0, sizeof(*sd));
 
        sd = malloc(sizeof(*sd));
        memset(sd, 0, sizeof(*sd));

-       sd->cmds = malloc(td->iodepth * sizeof(struct sgio_cmd));
-       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);
+       sd->cmds = malloc(td->o.iodepth * sizeof(struct sgio_cmd));
+       memset(sd->cmds, 0, td->o.iodepth * sizeof(struct sgio_cmd));
+       sd->events = malloc(td->o.iodepth * sizeof(struct io_u *));
+       memset(sd->events, 0, td->o.iodepth * sizeof(struct io_u *));
+       sd->pfds = malloc(sizeof(struct pollfd) * td->o.nr_files);
+       memset(sd->pfds, 0, sizeof(struct pollfd) * td->o.nr_files);
+       sd->fd_flags = malloc(sizeof(int) * td->o.nr_files);
+       memset(sd->fd_flags, 0, sizeof(int) * td->o.nr_files);
+       sd->sgbuf = malloc(sizeof(struct sg_io_hdr) * td->o.iodepth);
+       memset(sd->sgbuf, 0, sizeof(struct sg_io_hdr) * td->o.iodepth);

 
        td->io_ops->data = sd;
 
        /*
         * we want to do it, regardless of whether odirect is set or not
         */
 
        td->io_ops->data = sd;
 
        /*
         * we want to do it, regardless of whether odirect is set or not
         */

-       td->override_sync = 1;
+       td->o.override_sync = 1;

        return 0;
 }
 
        return 0;
 }
 


@@ -365,7 +362,7 @@ static int fio_sgio_type_check(struct thread_data *td, struct fio_file *f)
                if (ret)
                        return 1;
        } else {
                if (ret)
                        return 1;
        } else {

-               log_err("ioengine sgio only works on block devices\n");
+               log_err("ioengine sg only works on block devices\n");

                return 1;
        }
 
                return 1;
        }
 


@@ -388,8 +385,8 @@ static int fio_sgio_open(struct thread_data *td, struct fio_file *f)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 

-       if (!sd->type_checked && fio_sgio_type_check(td, f)) {
-               generic_close_file(td, f);
+       if (sd && !sd->type_checked && fio_sgio_type_check(td, f)) {
+               ret = generic_close_file(td, f);

                return 1;
        }
 
                return 1;
        }
 


@@ -407,6 +404,7 @@ static struct ioengine_ops ioengine = {
        .cleanup        = fio_sgio_cleanup,
        .open_file      = fio_sgio_open,
        .close_file     = generic_close_file,
        .cleanup        = fio_sgio_cleanup,
        .open_file      = fio_sgio_open,
        .close_file     = generic_close_file,

+       .get_file_size  = generic_get_file_size,

        .flags          = FIO_SYNCIO | FIO_RAWIO,
 };
 
        .flags          = FIO_SYNCIO | FIO_RAWIO,
 };
 


@@ -419,12 +417,12 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_sgio_init(struct thread_data fio_unused *td)
 {
  */
 static int fio_sgio_init(struct thread_data fio_unused *td)
 {

-       fprintf(stderr, "fio: sgio not available\n");
+       fprintf(stderr, "fio: ioengine sg not available\n");

        return 1;
 }
 
 static struct ioengine_ops ioengine = {
        return 1;
 }
 
 static struct ioengine_ops ioengine = {

-       .name           = "sgio",
+       .name           = "sg",

        .version        = FIO_IOOPS_VERSION,
        .init           = fio_sgio_init,
 };
        .version        = FIO_IOOPS_VERSION,
        .init           = fio_sgio_init,
 };