X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fguasi.c;h=c9c742959902793f34e98f94acb9b61be7a7bb86;hp=69b2cd2a7f2435e692361cf2d437aff8ea9105eb;hb=d5b351d483aabb0d0a0acd2930640428aa8e6339;hpb=7101d9c24abec4be58a086d85d6d92ec6e6492e9

diff --git a/engines/guasi.c b/engines/guasi.c
index 69b2cd2a..c9c74295 100644
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -3,12 +3,7 @@
  *
  * IO engine using the GUASI library.
  *
- * This is currently disabled. To enable it, execute:
- *
- * $ export EXTFLAGS="-DFIO_HAVE_GUASI"
- * $ export EXTLIBS="-lguasi"
- *
- * before running make. You'll need the GUASI lib as well:
+ * Before running make. You'll need the GUASI lib as well:
  *
  * http://www.xmailserver.org/guasi-lib.html
  *
@@ -21,8 +16,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_GUASI
-
 #define GFIO_MIN_THREADS 32
 #ifndef GFIO_MAX_THREADS
 #define GFIO_MAX_THREADS 2000
@@ -86,8 +79,8 @@ static struct io_u *fio_guasi_event(struct thread_data *td, int event)
 	return io_u;
 }
 
-static int fio_guasi_getevents(struct thread_data *td, int min, int max,
-			       struct timespec *t)
+static int fio_guasi_getevents(struct thread_data *td, unsigned int min,
+			       unsigned int max, struct timespec *t)
 {
 	struct guasi_data *ld = td->io_ops->data;
 	int n, r;
@@ -141,6 +134,10 @@ static void fio_guasi_queued(struct thread_data *td, struct io_u **io_us, int nr
 	struct io_u *io_u;
 	struct timeval now;
 
+	if (!fio_fill_issue_time(td))
+		return;
+
+	io_u_mark_submit(td, nr);
 	fio_gettime(&now, NULL);
 	for (i = 0; i < nr; i++) {
 		io_u = io_us[i];
@@ -170,7 +167,7 @@ static int fio_guasi_commit(struct thread_data *td)
 			io_u->greq = guasi__pwrite(ld->hctx, ld, io_u, 0,
 						   f->fd, io_u->xfer_buf, io_u->xfer_buflen,
 						   io_u->offset);
-		else if (io_u->ddir == DDIR_SYNC)
+		else if (ddir_sync(io_u->ddir))
 			io_u->greq = guasi__fsync(ld->hctx, ld, io_u, 0, f->fd);
 		else {
 			log_err("fio_guasi_commit() FAILED: unknow request %d\n",
@@ -212,7 +209,6 @@ static void fio_guasi_cleanup(struct thread_data *td)
 		free(ld->reqs);
 		free(ld->io_us);
 		free(ld);
-		td->io_ops->data = NULL;
 	}
 	GDBG_PRINT(("fio_guasi_cleanup(%p) DONE\n", ld));
 }
@@ -258,29 +254,9 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_guasi_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 };
 
-#else /* FIO_HAVE_GUASI */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_guasi_init(struct thread_data fio_unused *td)
-{
-	fprintf(stderr, "fio: guasi not available\n");
-	return 1;
-}
-
-static struct ioengine_ops ioengine = {
-	.name		= "guasi",
-	.version	= FIO_IOOPS_VERSION,
-	.init		= fio_guasi_init,
-};
-
-#endif
-
 static void fio_init fio_guasi_register(void)
 {
 	register_ioengine(&ioengine);