X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fguasi.c;h=4839019fc49c3ec88facc04eda4e5c812b3a68f9;hb=4e5b8fb8e2d989789e18b31f9aed969c8fa43cdb;hp=1b717be87eda7184ee8828c8697c52d917ecd15e;hpb=0798ba36674a7a244e8bc10877e322973a5ca938;p=fio.git

diff --git a/engines/guasi.c b/engines/guasi.c
index 1b717be8..4839019f 100644
--- a/engines/guasi.c
+++ b/engines/guasi.c
@@ -37,9 +37,6 @@
 #define GDBG_PRINT(a) (void) 0
 #endif
 
-#define STFU_GCC(a) a = a
-
-
 struct guasi_data {
 	guasi_t hctx;
 	int max_reqs;
@@ -89,8 +86,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;
@@ -127,6 +124,8 @@ static int fio_guasi_queue(struct thread_data *td, struct io_u *io_u)
 {
 	struct guasi_data *ld = td->io_ops->data;
 
+	fio_ro_check(td, io_u);
+
 	GDBG_PRINT(("fio_guasi_queue(%p)\n", io_u));
 	if (ld->queued_nr == (int) td->o.iodepth)
 		return FIO_Q_BUSY;
@@ -142,6 +141,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];
@@ -171,7 +174,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",
@@ -190,11 +193,9 @@ static int fio_guasi_commit(struct thread_data *td)
 	return 0;
 }
 
-static int fio_guasi_cancel(struct thread_data *td, struct io_u *io_u)
+static int fio_guasi_cancel(struct thread_data fio_unused *td,
+			    struct io_u *io_u)
 {
-	struct guasi_data *ld = td->io_ops->data;
-
-	STFU_GCC(ld);
 	GDBG_PRINT(("fio_guasi_cancel(%p) req=%p\n", io_u, io_u->greq));
 	if (io_u->greq != NULL)
 		guasi_req_cancel(io_u->greq);
@@ -215,7 +216,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));
 }
@@ -261,6 +261,7 @@ 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 */
@@ -272,7 +273,7 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_guasi_init(struct thread_data fio_unused *td)
 {
-	fprintf(stderr, "fio: guasi not available\n");
+	log_err("fio: guasi not available\n");
 	return 1;
 }