Get rid of syslet-rw compile warnings on 32-bit
[fio.git] / engines / syslet-rw.c
index d4398106632f287674580d426737c16ee6fd2000..2a159d0893f0e40ddbbad0b2c259340487c7b7fc 100644 (file)
@@ -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>
 #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
+
+#define ATOM_TO_IOU(p) ((struct io_u *) (unsigned long) (p))
+
 struct syslet_data {
        struct io_u **events;
        unsigned int nr_events;
        
        struct async_head_user ahu;
        struct syslet_uatom **ring;
+
+       struct syslet_uatom *head, *tail;
 };
 
+static void fio_syslet_complete_atom(struct thread_data *td,
+                                    struct syslet_uatom *atom)
+{
+       struct syslet_data *sd = td->io_ops->data;
+       struct syslet_uatom *last;
+       struct io_u *io_u;
+
+       /*
+        * complete from the beginning of the sequence up to (and
+        * including) this atom
+        */
+       last = atom;
+       io_u = ATOM_TO_IOU(atom);
+       atom = io_u->req.head;
+
+       /*
+        * now complete in right order
+        */
+       do {
+               long ret;
+
+               io_u = ATOM_TO_IOU(atom);
+               ret = *(long *) (unsigned long) atom->ret_ptr;
+               if (ret >= 0)
+                       io_u->resid = io_u->xfer_buflen - ret;
+               else if (ret < 0)
+                       io_u->error = ret;
+
+               assert(sd->nr_events < td->o.iodepth);
+               sd->events[sd->nr_events++] = io_u;
+
+               if (atom == last)
+                       break;
+
+               atom = (struct syslet_uatom *) (unsigned long) atom->next;
+       } while (1);
+
+       assert(!last->next);
+}
+
 /*
  * Inspect the ring to see if we have completed events
  */
@@ -30,25 +85,16 @@ static void fio_syslet_complete(struct thread_data *td)
 
        do {
                struct syslet_uatom *atom;
-               struct io_u *io_u;
-               long ret;
 
                atom = sd->ring[sd->ahu.user_ring_idx];
                if (!atom)
                        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;
 
-               io_u = atom->private;
-               ret = *atom->ret_ptr;
-               if (ret > 0)
-                       io_u->resid = io_u->xfer_buflen - ret;
-               else if (ret < 0)
-                       io_u->error = ret;
-
-               sd->events[sd->nr_events++] = io_u;
+               fio_syslet_complete_atom(td, atom);
        } while (1);
 }
 
@@ -57,7 +103,6 @@ static int fio_syslet_getevents(struct thread_data *td, int min,
                                struct timespec fio_unused *t)
 {
        struct syslet_data *sd = td->io_ops->data;
-       int get_events;
        long ret;
 
        do {
@@ -72,8 +117,7 @@ static int fio_syslet_getevents(struct thread_data *td, int min,
                /*
                 * OK, we need to wait for some events...
                 */
-               get_events = min - sd->nr_events;
-               ret = async_wait(get_events, sd->ahu.user_ring_idx, &sd->ahu);
+               ret = async_wait(1, sd->ahu.user_ring_idx, &sd->ahu);
                if (ret < 0)
                        return -errno;
        } while (1);
@@ -96,14 +140,15 @@ static void init_atom(struct syslet_uatom *atom, int nr, void *arg0,
 {
        atom->flags = flags;
        atom->nr = nr;
-       atom->ret_ptr = ret_ptr;
-       atom->next = NULL;
-       atom->arg_ptr[0] = arg0;
-       atom->arg_ptr[1] = arg1;
-       atom->arg_ptr[2] = arg2;
-       atom->arg_ptr[3] = arg3;
-       atom->arg_ptr[4] = atom->arg_ptr[5] = NULL;
-       atom->private = priv;
+       atom->ret_ptr = (uint64_t) (unsigned long) ret_ptr;
+       atom->next = 0;
+       atom->arg_ptr[0] = (uint64_t) (unsigned long) arg0;
+       atom->arg_ptr[1] = (uint64_t) (unsigned long) arg1;
+       atom->arg_ptr[2] = (uint64_t) (unsigned long) arg2;
+       atom->arg_ptr[3] = (uint64_t) (unsigned long) arg3;
+       atom->arg_ptr[4] = 0;
+       atom->arg_ptr[5] = 0;
+       atom->private = (uint64_t) (unsigned long) priv;
 }
 
 /*
@@ -123,9 +168,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);
@@ -146,53 +191,81 @@ static int fio_syslet_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 static void cachemiss_thread_start(void)
 {
        while (1)
-               async_thread();
+               async_thread(NULL, NULL);
 }
 
 #define THREAD_STACK_SIZE (16384)
 
 static unsigned long thread_stack_alloc()
 {
-       return (unsigned long)malloc(THREAD_STACK_SIZE) + THREAD_STACK_SIZE;
+       return (unsigned long) malloc(THREAD_STACK_SIZE) + THREAD_STACK_SIZE;
 }
 
-static int fio_syslet_queue(struct thread_data *td, struct io_u *io_u)
+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_TO_IOU(atom);
+
+               memcpy(&io_u->issue_time, &now, sizeof(now));
+               io_u_queued(td, io_u);
+               atom = (struct syslet_uatom *) (unsigned long) atom->next;
+       }
+}
+
+static int fio_syslet_commit(struct thread_data *td)
 {
        struct syslet_data *sd = td->io_ops->data;
        struct syslet_uatom *done;
-       long ret;
+
+       if (!sd->head)
+               return 0;
+
+       assert(!sd->tail->next);
 
        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.
         */
-       done = async_exec(&io_u->req.atom, &sd->ahu);
+       done = async_exec(sd->head, &sd->ahu);
 
-       if (!done)
-               return FIO_Q_QUEUED;
-
-       /*
-        * completed sync
-        */
-       ret = io_u->req.ret;
-       if (ret != (long) io_u->xfer_buflen) {
-               if (ret > 0) {
-                       io_u->resid = io_u->xfer_buflen - ret;
-                       io_u->error = 0;
-                       return FIO_Q_COMPLETED;
-               } else
-                       io_u->error = errno;
+       if (done == (void *) -1) {
+               log_err("fio: syslets don't appear to work\n");
+               return -1;
        }
 
-       assert(sd->nr_events < td->iodepth);
+       sd->head = sd->tail = NULL;
 
-       if (io_u->error)
-               td_verror(td, io_u->error, "xfer");
+       if (done)
+               fio_syslet_complete_atom(td, done);
 
-       return FIO_Q_COMPLETED;
+       return 0;
+}
+
+static int fio_syslet_queue(struct thread_data *td, struct io_u *io_u)
+{
+       struct syslet_data *sd = td->io_ops->data;
+
+       fio_ro_check(td, io_u);
+
+       if (sd->tail) {
+               sd->tail->next = (uint64_t) (unsigned long) &io_u->req.atom;
+               sd->tail = &io_u->req.atom;
+       } else
+               sd->head = sd->tail = (struct syslet_uatom *)&io_u->req.atom;
+
+       io_u->req.head = sd->head;
+       return FIO_Q_QUEUED;
 }
 
 static int async_head_init(struct syslet_data *sd, unsigned int depth)
@@ -206,11 +279,12 @@ static int async_head_init(struct syslet_data *sd, unsigned int depth)
        memset(sd->ring, 0, ring_size);
 
        sd->ahu.user_ring_idx = 0;
-       sd->ahu.completion_ring = sd->ring;
+       sd->ahu.completion_ring_ptr = (uint64_t) (unsigned long) sd->ring;
        sd->ahu.ring_size_bytes = ring_size;
        sd->ahu.head_stack = thread_stack_alloc();
-       sd->ahu.head_eip = (unsigned long)cachemiss_thread_start;
-       sd->ahu.new_thread_eip = (unsigned long)cachemiss_thread_start;
+       sd->ahu.head_ip = (uint64_t) (unsigned long) cachemiss_thread_start;
+       sd->ahu.new_thread_ip = (uint64_t) (unsigned long) cachemiss_thread_start;
+       sd->ahu.new_thread_stack = thread_stack_alloc();
 
        return 0;
 }
@@ -220,6 +294,19 @@ static void async_head_exit(struct syslet_data *sd)
        free(sd->ring);
 }
 
+static int check_syslet_support(struct syslet_data *sd)
+{
+       struct syslet_uatom atom;
+       void *ret;
+
+       init_atom(&atom, __NR_getpid, NULL, NULL, NULL, NULL, NULL, 0, NULL);
+       ret = async_exec(&atom, &sd->ahu);
+       if (ret == (void *) -1)
+               return 1;
+
+       return 0;
+}
+
 static void fio_syslet_cleanup(struct thread_data *td)
 {
        struct syslet_data *sd = td->io_ops->data;
@@ -236,16 +323,22 @@ static int fio_syslet_init(struct thread_data *td)
 {
        struct syslet_data *sd;
 
-
        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;
+       }
+
+       if (check_syslet_support(sd)) {
+               log_err("fio: syslets do not appear to work\n");
                free(sd->events);
                free(sd);
                return 1;
@@ -261,9 +354,12 @@ static struct ioengine_ops ioengine = {
        .init           = fio_syslet_init,
        .prep           = fio_syslet_prep,
        .queue          = fio_syslet_queue,
+       .commit         = fio_syslet_commit,
        .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 */