->getevents() should take unsigned args

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

diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c
index 2e23fc937fee6fca810c694f0dfa7f96563bbb4d..8f2c415d56a4a8aa6d61d2d25e2a279d436b88a3 100644 (file)
--- a/engines/syslet-rw.c
+++ b/engines/syslet-rw.c
@@ -32,10 +32,11 @@ struct syslet_data {
        unsigned int nr_events;
        
        struct syslet_ring *ring;
+       unsigned int ring_mask;
        void *stack;
 };
 
-static void fio_syslet_complete(struct thread_data *td, struct io_u *io_u)
+static void fio_syslet_add_event(struct thread_data *td, struct io_u *io_u)
 {
        struct syslet_data *sd = td->io_ops->data;
 
@@ -43,29 +44,38 @@ static void fio_syslet_complete(struct thread_data *td, struct io_u *io_u)
        sd->events[sd->nr_events++] = io_u;
 }
 
-static void syslet_complete_nr(struct thread_data *td, unsigned int nr)
+static void fio_syslet_add_events(struct thread_data *td, unsigned int nr)
 {
        struct syslet_data *sd = td->io_ops->data;
-       unsigned int i;
+       unsigned int i, uidx;
+
+       uidx = sd->ring->user_tail;
+       read_barrier();
 
        for (i = 0; i < nr; i++) {
-               unsigned int idx = (i + sd->ring->user_tail) % td->o.iodepth;
+               unsigned int idx = (i + uidx) & sd->ring_mask;
                struct syslet_completion *comp = &sd->ring->comp[idx];
                struct io_u *io_u = (struct io_u *) (long) comp->caller_data;
+               long ret;
+
+               ret = comp->status;
+               if (ret <= 0) {
+                       io_u->resid = io_u->xfer_buflen;
+                       io_u->error = -ret;
+               } else {
+                       io_u->resid = io_u->xfer_buflen - ret;
+                       io_u->error = 0;
+               }
 
-               io_u->resid = io_u->xfer_buflen - comp->status;
-               fio_syslet_complete(td, io_u);
+               fio_syslet_add_event(td, io_u);
        }
 }
 
-
 static void fio_syslet_wait_for_events(struct thread_data *td)
 {
        struct syslet_data *sd = td->io_ops->data;
        struct syslet_ring *ring = sd->ring;
-       unsigned int events;
 
-       events = 0;
        do {
                unsigned int kh = ring->kernel_head;
                int ret;
@@ -76,10 +86,9 @@ static void fio_syslet_wait_for_events(struct thread_data *td)
                if (ring->user_tail != kh) {
                        unsigned int nr = kh - ring->user_tail;
 
-                       syslet_complete_nr(td, nr);
-                       events += nr;
+                       fio_syslet_add_events(td, nr);
                        ring->user_tail = kh;
-                       continue;
+                       break;
                }
 
                /*
@@ -87,25 +96,21 @@ static void fio_syslet_wait_for_events(struct thread_data *td)
                 */
                ret = syscall(__NR_syslet_ring_wait, ring, ring->user_tail);
                assert(!ret);
-       } while (!events);
+       } while (1);
 }
 
-static int fio_syslet_getevents(struct thread_data *td, int min,
-                               int fio_unused max,
+static int fio_syslet_getevents(struct thread_data *td, unsigned int min,
+                               unsigned int fio_unused max,
                                struct timespec fio_unused *t)
 {
        struct syslet_data *sd = td->io_ops->data;
        long ret;
 
-       do {
-               /*
-                * do we have enough immediate completions?
-                */
-               if (sd->nr_events >= (unsigned int) min)
-                       break;
-
+       /*
+        * While we have less events than requested, block waiting for them
+        */
+       while (sd->nr_events < (unsigned int) min)
                fio_syslet_wait_for_events(td);
-       } while (1);
 
        ret = sd->nr_events;
        sd->nr_events = 0;
@@ -254,6 +259,7 @@ static int fio_syslet_init(struct thread_data *td)
                goto err_mem;
 
        sd->ring = ring;
+       sd->ring_mask = ring_nr - 1;
        sd->stack = stack;
 
        memset(sd->ring, 0, ring_size);