Move thread options into a seperate structure

[fio.git] / engines / syslet-rw.c

diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c
index 4b1b263691f5825ef247b38a564a8c66f6d4f3cb..a293e7f4715d415622f50b971ac1012a513ec9a2 100644 (file)
--- a/engines/syslet-rw.c
+++ b/engines/syslet-rw.c
@@ -1,5 +1,8 @@
 /*
- * read/write() engine that uses syslet to be async
+ * syslet engine
+ *
+ * IO engine that does regular pread(2)/pwrite(2) to transfer data, but
+ * with syslets to make the execution async.
  *
  */
 #include <stdio.h>
@@ -7,12 +10,21 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
+#include <asm/unistd.h>
 
 #include "../fio.h"
 #include "../os.h"
 
 #ifdef FIO_HAVE_SYSLET
 
+#ifdef __NR_pread64
+#define __NR_fio_pread __NR_pread64
+#define __NR_fio_pwrite        __NR_pwrite64
+#else
+#define __NR_fio_pread __NR_pread
+#define __NR_fio_pwrite        __NR_pwrite
+#endif
+
 struct syslet_data {
        struct io_u **events;
        unsigned int nr_events;
@@ -46,12 +58,12 @@ static void fio_syslet_complete_atom(struct thread_data *td,
 
                io_u = atom->private;
                ret = *atom->ret_ptr;
-               if (ret > 0)
+               if (ret >= 0)
                        io_u->resid = io_u->xfer_buflen - ret;
                else if (ret < 0)
                        io_u->error = ret;
 
-               assert(sd->nr_events < td->iodepth);
+               assert(sd->nr_events < td->o.iodepth);
                sd->events[sd->nr_events++] = io_u;
 
                if (atom == last)
@@ -78,7 +90,7 @@ static void fio_syslet_complete(struct thread_data *td)
                        break;
 
                sd->ring[sd->ahu.user_ring_idx] = NULL;
-               if (++sd->ahu.user_ring_idx == td->iodepth)
+               if (++sd->ahu.user_ring_idx == td->o.iodepth)
                        sd->ahu.user_ring_idx = 0;
 
                fio_syslet_complete_atom(td, atom);
@@ -154,9 +166,9 @@ static void fio_syslet_prep_rw(struct io_u *io_u, struct fio_file *f)
         * prepare rw
         */
        if (io_u->ddir == DDIR_READ)
-               nr = __NR_pread64;
+               nr = __NR_fio_pread;
        else
-               nr = __NR_pwrite64;
+               nr = __NR_fio_pwrite;
 
        init_atom(&io_u->req.atom, nr, &f->fd, &io_u->xfer_buf,
                  &io_u->xfer_buflen, &io_u->offset, &io_u->req.ret, 0, io_u);
@@ -187,6 +199,23 @@ static unsigned long thread_stack_alloc()
        return (unsigned long) malloc(THREAD_STACK_SIZE) + THREAD_STACK_SIZE;
 }
 
+static void fio_syslet_queued(struct thread_data *td, struct syslet_data *sd)
+{
+       struct syslet_uatom *atom;
+       struct timeval now;
+
+       fio_gettime(&now, NULL);
+
+       atom = sd->head;
+       while (atom) {
+               struct io_u *io_u = atom->private;
+
+               memcpy(&io_u->issue_time, &now, sizeof(now));
+               io_u_queued(td, io_u);
+               atom = atom->next;
+       }
+}
+
 static int fio_syslet_commit(struct thread_data *td)
 {
        struct syslet_data *sd = td->io_ops->data;
@@ -200,6 +229,8 @@ static int fio_syslet_commit(struct thread_data *td)
        if (!sd->ahu.new_thread_stack)
                sd->ahu.new_thread_stack = thread_stack_alloc();
 
+       fio_syslet_queued(td, sd);
+
        /*
         * On sync completion, the atom is returned. So on NULL return
         * it's queued asynchronously.
@@ -272,13 +303,13 @@ static int fio_syslet_init(struct thread_data *td)
 
        sd = malloc(sizeof(*sd));
        memset(sd, 0, sizeof(*sd));
-       sd->events = malloc(sizeof(struct io_u *) * td->iodepth);
-       memset(sd->events, 0, sizeof(struct io_u *) * td->iodepth);
+       sd->events = malloc(sizeof(struct io_u *) * td->o.iodepth);
+       memset(sd->events, 0, sizeof(struct io_u *) * td->o.iodepth);
 
        /*
         * This will handily fail for kernels where syslet isn't available
         */
-       if (async_head_init(sd, td->iodepth)) {
+       if (async_head_init(sd, td->o.iodepth)) {
                free(sd->events);
                free(sd);
                return 1;
@@ -298,6 +329,8 @@ static struct ioengine_ops ioengine = {
        .getevents      = fio_syslet_getevents,
        .event          = fio_syslet_event,
        .cleanup        = fio_syslet_cleanup,
+       .open_file      = generic_open_file,
+       .close_file     = generic_close_file,
 };
 
 #else /* FIO_HAVE_SYSLET */