X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fglusterfs_async.c;h=7c2c1398386707cd7a8f477df90561eb45bbadc3;hp=e2c76dc2fa9e1bf7a32603aa1a1ec199fb6c938b;hb=29407f16b06cd03e43058f51dd5cca7aa0f0f321;hpb=88db271760acda97550207c0c9329a608a229c8c

diff --git a/engines/glusterfs_async.c b/engines/glusterfs_async.c
index e2c76dc2..7c2c1398 100644
--- a/engines/glusterfs_async.c
+++ b/engines/glusterfs_async.c
@@ -14,39 +14,40 @@ struct fio_gf_iou {
 static struct io_u *fio_gf_event(struct thread_data *td, int event)
 {
 	struct gf_data *gf_data = td->io_ops->data;
+
 	dprint(FD_IO, "%s\n", __FUNCTION__);
 	return gf_data->aio_events[event];
 }
 
 static int fio_gf_getevents(struct thread_data *td, unsigned int min,
-			     unsigned int max, struct timespec *t)
+			    unsigned int max, const struct timespec *t)
 {
 	struct gf_data *g = td->io_ops->data;
 	unsigned int events = 0;
 	struct io_u *io_u;
-	int i = 0;
-	struct fio_gf_iou *io = NULL;
+	int i;
 
 	dprint(FD_IO, "%s\n", __FUNCTION__);
 	do {
 		io_u_qiter(&td->io_u_all, io_u, i) {
+			struct fio_gf_iou *io;
+
 			if (!(io_u->flags & IO_U_F_FLIGHT))
 				continue;
 
-			io = (struct fio_gf_iou *)io_u->engine_data;
-
-			if (io && io->io_complete) {
+			io = io_u->engine_data;
+			if (io->io_complete) {
 				io->io_complete = 0;
 				g->aio_events[events] = io_u;
 				events++;
 
-                if (events >= max) 
-                    break;
+				if (events >= max)
+					break;
 			}
 
 		}
 		if (events < min)
-			usleep(10);
+			usleep(100);
 		else
 			break;
 
@@ -60,9 +61,8 @@ static void fio_gf_io_u_free(struct thread_data *td, struct io_u *io_u)
 	struct fio_gf_iou *io = io_u->engine_data;
 
 	if (io) {
-        if (io->io_complete){
-            log_err("incomplete IO found.\n");
-        }
+		if (io->io_complete)
+			log_err("incomplete IO found.\n");
 		io_u->engine_data = NULL;
 		free(io);
 	}
@@ -70,62 +70,65 @@ static void fio_gf_io_u_free(struct thread_data *td, struct io_u *io_u)
 
 static int fio_gf_io_u_init(struct thread_data *td, struct io_u *io_u)
 {
-	struct fio_gf_iou *io = NULL;
-
 	dprint(FD_FILE, "%s\n", __FUNCTION__);
 
-    if (!io_u->engine_data){
-        io = malloc(sizeof(struct fio_gf_iou));
-        if (!io){
-            td_verror(td, errno, "malloc");
-            return 1;
-        }
-        io->io_complete = 0;
-        io->io_u = io_u;
-        io_u->engine_data = io;
-    }
+	if (!io_u->engine_data) {
+		struct fio_gf_iou *io;
+
+		io = malloc(sizeof(struct fio_gf_iou));
+		if (!io) {
+			td_verror(td, errno, "malloc");
+			return 1;
+		}
+		io->io_complete = 0;
+		io->io_u = io_u;
+		io_u->engine_data = io;
+	}
 	return 0;
 }
 
-static void gf_async_cb(glfs_fd_t *fd, ssize_t ret, void *data) 
+static void gf_async_cb(glfs_fd_t * fd, ssize_t ret, void *data)
 {
-	struct io_u *io_u = (struct io_u *)data;
-	struct fio_gf_iou *iou =
-	    (struct fio_gf_iou *)io_u->engine_data;
+	struct io_u *io_u = data;
+	struct fio_gf_iou *iou = io_u->engine_data;
 
-    dprint(FD_IO, "%s ret %lu\n", __FUNCTION__, ret);    
-    iou->io_complete = 1;
+	dprint(FD_IO, "%s ret %lu\n", __FUNCTION__, ret);
+	iou->io_complete = 1;
 }
 
-static int fio_gf_async_queue(struct thread_data fio_unused *td, struct io_u *io_u)
+static int fio_gf_async_queue(struct thread_data fio_unused * td,
+			      struct io_u *io_u)
 {
 	struct gf_data *g = td->io_ops->data;
-    int r = 0;
+	int r;
 
-    dprint(FD_IO, "%s op %s\n", __FUNCTION__,  
-           io_u->ddir == DDIR_READ? "read": io_u->ddir == DDIR_WRITE? "write":io_u->ddir == DDIR_SYNC? "sync":"unknown");    
+	dprint(FD_IO, "%s op %s\n", __FUNCTION__, io_ddir_name(io_u->ddir));
 
 	fio_ro_check(td, io_u);
 
 	if (io_u->ddir == DDIR_READ)
-		r = glfs_pread_async(g->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset,
-                         0, gf_async_cb, (void *)io_u);
+		r = glfs_pread_async(g->fd, io_u->xfer_buf, io_u->xfer_buflen,
+				     io_u->offset, 0, gf_async_cb, io_u);
 	else if (io_u->ddir == DDIR_WRITE)
-		r = glfs_pwrite_async(g->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset,
-                         0, gf_async_cb, (void *)io_u);
-    else if (io_u->ddir == DDIR_SYNC) {
-        r = glfs_fsync_async(g->fd, gf_async_cb, (void *)io_u);
-    }else { 	    
-        log_err("unsupported operation.\n");
-        io_u->error = -EINVAL;
-        goto failed;
-    }
-    if (r){
-        log_err("glfs failed.\n");
-        io_u->error = r;
-        goto failed;
-    }
-
+		r = glfs_pwrite_async(g->fd, io_u->xfer_buf, io_u->xfer_buflen,
+				      io_u->offset, 0, gf_async_cb, io_u);
+#if defined(CONFIG_GF_TRIM)
+	else if (io_u->ddir == DDIR_TRIM)
+		r = glfs_discard_async(g->fd, io_u->offset, io_u->xfer_buflen,
+				       gf_async_cb, io_u);
+#endif
+	else if (io_u->ddir == DDIR_DATASYNC)
+		r = glfs_fdatasync_async(g->fd, gf_async_cb, io_u);
+	else if (io_u->ddir == DDIR_SYNC)
+		r = glfs_fsync_async(g->fd, gf_async_cb, io_u);
+	else
+		r = EINVAL;
+
+	if (r) {
+		log_err("glfs queue failed.\n");
+		io_u->error = r;
+		goto failed;
+	}
 	return FIO_Q_QUEUED;
 
 failed:
@@ -136,64 +139,53 @@ failed:
 
 int fio_gf_async_setup(struct thread_data *td)
 {
-	int r = 0;
-	struct gf_data *g = NULL;
+	struct gf_data *g;
+	int r;
+
 #if defined(NOT_YET)
-    fprintf(stderr, "the async interface is still very experimental...\n");
+	log_err("the async interface is still very experimental...\n");
 #endif
-    r = fio_gf_setup(td);
-    if (r){
-        return r;
-    }
-    g = td->io_ops->data;
-    g->aio_events = malloc(td->o.iodepth * sizeof(struct io_u *));
-	if (!g->aio_events){
-        r = -ENOMEM;
-        fio_gf_cleanup(td);
-        return r;
-    }
-
-	memset(g->aio_events, 0, td->o.iodepth * sizeof(struct io_u *));
-
-    return r;
-
-}
-
-static int fio_gf_async_prep(struct thread_data *td, struct io_u *io_u)
-{
-	dprint(FD_FILE, "%s\n", __FUNCTION__);
-
-	if (!ddir_rw(io_u->ddir))
-		return 0;
+	r = fio_gf_setup(td);
+	if (r)
+		return r;
+
+	td->o.use_thread = 1;
+	g = td->io_ops->data;
+	g->aio_events = calloc(td->o.iodepth, sizeof(struct io_u *));
+	if (!g->aio_events) {
+		r = -ENOMEM;
+		fio_gf_cleanup(td);
+		return r;
+	}
 
-	return 0;
+	return r;
 }
 
 static struct ioengine_ops ioengine = {
-	.name		    = "gfapi_async",
-	.version	    = FIO_IOOPS_VERSION,
-	.init           = fio_gf_async_setup,
-	.cleanup        = fio_gf_cleanup,
-    .prep           = fio_gf_async_prep,
-  	.queue		    = fio_gf_async_queue,
-	.open_file	    = fio_gf_open_file,
-	.close_file	    = fio_gf_close_file,
-	.get_file_size	= fio_gf_get_file_size,
-	.getevents      = fio_gf_getevents,
-	.event          = fio_gf_event,
-	.io_u_init      = fio_gf_io_u_init,
-	.io_u_free      = fio_gf_io_u_free,
-	.options        = gfapi_options,
+	.name = "gfapi_async",
+	.version = FIO_IOOPS_VERSION,
+	.init = fio_gf_async_setup,
+	.cleanup = fio_gf_cleanup,
+	.queue = fio_gf_async_queue,
+	.open_file = fio_gf_open_file,
+	.close_file = fio_gf_close_file,
+	.unlink_file = fio_gf_unlink_file,
+	.get_file_size = fio_gf_get_file_size,
+	.getevents = fio_gf_getevents,
+	.event = fio_gf_event,
+	.io_u_init = fio_gf_io_u_init,
+	.io_u_free = fio_gf_io_u_free,
+	.options = gfapi_options,
 	.option_struct_size = sizeof(struct gf_options),
-	.flags		    = FIO_DISKLESSIO,
+	.flags = FIO_DISKLESSIO,
 };
 
 static void fio_init fio_gf_register(void)
 {
-    register_ioengine(&ioengine);
+	register_ioengine(&ioengine);
 }
 
 static void fio_exit fio_gf_unregister(void)
 {
-    unregister_ioengine(&ioengine);
+	unregister_ioengine(&ioengine);
 }