Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Oct 30, 2014

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 8859391bb7d77680ede51b46e770237abae566dc:

engines/glusterfs_async: cleanups (2014-10-28 20:48:33 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to a1f871c72971efe84cd42670d5df4c4dc56dbd3f:

engines: rename option specific pad from 'td' to 'pad' (2014-10-29 08:30:07 -0600)

----------------------------------------------------------------
Jens Axboe (5):
engines/glusterfs_async: remove no-op prep function Merge branch 'fix-rbd-options-parse' of https://github.com/ketor/fio
Merge branch 'optimize-busy-poll' of https://github.com/ketor/fio
engines/rbd: sort IO by start time before waiting on it
engines: rename option specific pad from 'td' to 'pad'

Ketor Meng (2):
fix rbd_option parse error
use io_complete var to avoid the rbd_aio_is_complete lock and context switch

 engines/cpu.c             |    2 +-
 engines/e4defrag.c        |    2 +-
 engines/gfapi.h           |    2 +-
 engines/glusterfs_async.c |   11 ---
 engines/libaio.c          |    2 +-
 engines/rbd.c             |  212 ++++++++++++++++++++++++++++-----------------
 6 files changed, 138 insertions(+), 93 deletions(-)

---

Diff of recent changes:

engines/cpu.c +1 -1
index 85598ef..7e4d737 100644
@@ -8,7 +8,7 @@
 #include "../fio.h"
 
 struct cpu_options {
-	struct thread_data *td;
+	void *pad;
 	unsigned int cpuload;
 	unsigned int cpucycle;
 	unsigned int exit_io_done;
engines/e4defrag.c +1 -1
index 3599ab8..6854070 100644
@@ -36,7 +36,7 @@ struct e4defrag_data {
 };
 
 struct e4defrag_options {
-	struct thread_data *td;
+	void *pad;
 	unsigned int inplace;
 	char * donor_name;
 };
engines/gfapi.h +1 -1
index 0da471c..1028431 100644
@@ -2,7 +2,7 @@
 #include "../fio.h"
 
 struct gf_options {
-	struct thread_data *td;
+	void *pad;
 	char *gf_vol;
 	char *gf_brick;
 };
engines/glusterfs_async.c +0 -11
index d9d6693..95ca84e 100644
@@ -159,22 +159,11 @@ int fio_gf_async_setup(struct thread_data *td)
 	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;
-
-	return 0;
-}
-
 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,
engines/libaio.c +1 -1
index f7e2f89..d4f4830 100644
@@ -37,7 +37,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-	struct thread_data *td;
+	void *pad;
 	unsigned int userspace_reap;
 };
 
engines/rbd.c +134 -78

422 lines not on this page · raw message