X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsyslet-rw.c;h=15e4c2578fe9ee978af4f4a1847ecf571871718e;hb=60f6b33079c8ffbd09f448060f58b82ba920b620;hp=8f2c415d56a4a8aa6d61d2d25e2a279d436b88a3;hpb=e7d2e61694c62b90a2fb84c012b4edcc1973d72c;p=fio.git

diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c
index 8f2c415d..15e4c257 100644
--- a/engines/syslet-rw.c
+++ b/engines/syslet-rw.c
@@ -14,8 +14,7 @@
 #include <asm/unistd.h>
 
 #include "../fio.h"
-#include "../indirect.h"
-#include "../syslet.h"
+#include "../lib/fls.h"
 
 #ifdef FIO_HAVE_SYSLET
 
@@ -108,8 +107,10 @@ static int fio_syslet_getevents(struct thread_data *td, unsigned int min,
 
 	/*
 	 * While we have less events than requested, block waiting for them
+	 * (if we have to, there may already be more completed events ready
+	 * for us - see fio_syslet_wait_for_events()
 	 */
-	while (sd->nr_events < (unsigned int) min)
+	while (sd->nr_events < min)
 		fio_syslet_wait_for_events(td);
 
 	ret = sd->nr_events;
@@ -130,6 +131,12 @@ static void fio_syslet_prep_sync(struct fio_file *f,
 	FILL_IN(*regs, __NR_fsync, (long) f->fd);
 }
 
+static void fio_syslet_prep_datasync(struct fio_file *f,
+				     struct indirect_registers *regs)
+{
+	FILL_IN(*regs, __NR_fdatasync, (long) f->fd);
+}
+
 static void fio_syslet_prep_rw(struct io_u *io_u, struct fio_file *f,
 			       struct indirect_registers *regs)
 {
@@ -153,6 +160,8 @@ static void fio_syslet_prep(struct io_u *io_u, struct indirect_registers *regs)
 
 	if (io_u->ddir == DDIR_SYNC)
 		fio_syslet_prep_sync(f, regs);
+	else if (io_u->ddir == DDIR_DATASYNC)
+		fio_syslet_prep_datasync(f, regs);
 	else
 		fio_syslet_prep_rw(io_u, f, regs);
 }
@@ -220,9 +229,7 @@ static void fio_syslet_cleanup(struct thread_data *td)
 	if (sd) {
 		free(sd->events);
 		free(sd->ring);
-		free(sd->stack);
 		free(sd);
-		td->io_ops->data = NULL;
 	}
 }
 
@@ -242,14 +249,8 @@ static int fio_syslet_init(struct thread_data *td)
 	 * The ring needs to be a power-of-2, so round it up if we have to
 	 */
 	ring_nr = td->o.iodepth;
-	if (ring_nr & (ring_nr - 1)) {
-		int bits = 1;
-
-		while (ring_nr >>= 1)
-			bits++;
-
-		ring_nr = 1 << bits;
-	}
+	if (ring_nr & (ring_nr - 1))
+		ring_nr = 1 << __fls(ring_nr);
 
 	ring_size = sizeof(struct syslet_ring) +
 			ring_nr * sizeof(struct syslet_completion);
@@ -291,6 +292,7 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_syslet_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 };
 
 #else /* FIO_HAVE_SYSLET */
@@ -302,7 +304,7 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_syslet_init(struct thread_data fio_unused *td)
 {
-	fprintf(stderr, "fio: syslet not available\n");
+	log_err("fio: syslet not available\n");
 	return 1;
 }