5 files changed, 35 insertions, 14 deletions

diff --git a/fio.h b/fio.h
index 751fc3d1..09cd01cd 100644
--- a/fio.h
+++ b/fio.h
@@ -30,6 +30,7 @@
 #include "iolog.h"
 #include "helpers.h"
 #include "options.h"
+#include "profile.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -430,8 +431,7 @@ struct thread_data {
 	/*
 	 * Can be overloaded by profiles
 	 */
-	int (*fill_io_u_off)(struct thread_data *, struct io_u *);
-	int (*fill_io_u_size)(struct thread_data *, struct io_u *);
+	struct prof_io_ops prof_io_ops;
 };
 
 /*
diff --git a/io_u.c b/io_u.c
index 278d47a4..9b9570ea 100644
--- a/io_u.c
+++ b/io_u.c
@@ -233,8 +233,10 @@ static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
 
 static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
-	if (td->fill_io_u_off)
-		return td->fill_io_u_off(td, io_u);
+	struct prof_io_ops *ops = &td->prof_io_ops;
+
+	if (ops->fill_io_u_off)
+		return ops->fill_io_u_off(td, io_u);
 
 	return __get_next_offset(td, io_u);
 }
@@ -286,8 +288,10 @@ static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
 
 static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 {
-	if (td->fill_io_u_size)
-		return td->fill_io_u_size(td, io_u);
+	struct prof_io_ops *ops = &td->prof_io_ops;
+
+	if (ops->fill_io_u_size)
+		return ops->fill_io_u_size(td, io_u);
 
 	return __get_next_buflen(td, io_u);
 }
@@ -785,7 +789,7 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
 	return f;
 }
 
-static struct fio_file *get_next_file(struct thread_data *td)
+static struct fio_file *__get_next_file(struct thread_data *td)
 {
 	struct fio_file *f;
 
@@ -820,6 +824,16 @@ out:
 	return f;
 }
 
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+	struct prof_io_ops *ops = &td->prof_io_ops;
+
+	if (ops->get_next_file)
+		return ops->get_next_file(td);
+
+	return __get_next_file(td);
+}
+
 static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
 {
 	struct fio_file *f;
diff --git a/parse.c b/parse.c
index 9e3c5b17..ff6a8735 100644
--- a/parse.c
+++ b/parse.c
@@ -825,6 +825,8 @@ int show_cmd_help(struct fio_option *options, const char *name)
 	int found = 0;
 	int show_all = 0;
 
+	printf("exec_profile=%s\n", exec_profile);
+
 	if (!name || !strcmp(name, "all"))
 		show_all = 1;
 
diff --git a/profile.c b/profile.c
index 0e2b97d4..3ed9127b 100644
--- a/profile.c
+++ b/profile.c
@@ -93,6 +93,6 @@ void profile_add_hooks(struct thread_data *td)
 	if (!ops)
 		return;
 
-	td->fill_io_u_off = ops->fill_io_u_off;
-	td->fill_io_u_size = ops->fill_io_u_size;
+	if (ops->io_ops)
+		td->prof_io_ops = *ops->io_ops;
 }
diff --git a/profile.h b/profile.h
index 3bae5002..a54f0724 100644
--- a/profile.h
+++ b/profile.h
@@ -3,6 +3,15 @@
 
 #include "flist.h"
 
+/*
+ * Functions for overriding internal fio io_u functions
+ */
+struct prof_io_ops {
+	int (*fill_io_u_off)(struct thread_data *, struct io_u *);
+	int (*fill_io_u_size)(struct thread_data *, struct io_u *);
+	struct fio_file *(*get_next_file)(struct thread_data *);
+};
+
 struct profile_ops {
 	struct flist_head list;
 	char name[32];
@@ -24,11 +33,7 @@ struct profile_ops {
 	 */
 	const char **cmdline;
 
-	/*
-	 * Functions for overriding internal fio io_u functions
-	 */
-	int (*fill_io_u_off)(struct thread_data *, struct io_u *);
-	int (*fill_io_u_size)(struct thread_data *, struct io_u *);
+	struct prof_io_ops *io_ops;
 };
 
 int register_profile(struct profile_ops *);