X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fguasi.c;h=6faae8d0bfc2054ea542f31181b3f888437ea06c;hb=47d94b0ba87db8646f1a1d15f8b3911b3c640b30;hp=e0bcaf4c72bf89058d7e78533de9beafd847bb9f;hpb=e7d2e61694c62b90a2fb84c012b4edcc1973d72c;p=fio.git

diff --git a/engines/guasi.c b/engines/guasi.c
index e0bcaf4c..6faae8d0 100644
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -21,8 +21,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_GUASI
-
 #define GFIO_MIN_THREADS 32
 #ifndef GFIO_MAX_THREADS
 #define GFIO_MAX_THREADS 2000
@@ -141,6 +139,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 +172,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 +214,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 +259,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);