fifo updates

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

diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c
index 0b2497a7e8c2029660825a1dc4aeb7ff533a64bb..7e407d785bfbcbb73125214d48e88d1bbd679c9f 100644 (file)
--- a/engines/syslet-rw.c
+++ b/engines/syslet-rw.c
@@ -13,7 +13,6 @@
 #include <asm/unistd.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 #ifdef FIO_HAVE_SYSLET
 
@@ -63,7 +62,7 @@ static void fio_syslet_complete_atom(struct thread_data *td,
                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)
@@ -90,7 +89,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);
@@ -237,6 +236,11 @@ static int fio_syslet_commit(struct thread_data *td)
         */
        done = async_exec(sd->head, &sd->ahu);
 
+       if (done == (void *) -1) {
+               log_err("fio: syslets don't appear to work\n");
+               return -1;
+       }
+
        sd->head = sd->tail = NULL;
 
        if (done)
@@ -284,6 +288,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(sd->head, &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;
@@ -300,16 +317,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;