X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=profile.c;h=90c9ea8d14eb6c4d52c5a94bef7eab3e32fc0a0e;hp=0e2b97d4a0933896532b4891bd650dcf63c16da0;hb=e3dae3b77f1a7285afd5a0ada6960eeb4a21e9a8;hpb=15dc1934435dc84d66547c4fc92d936224d7238f

diff --git a/profile.c b/profile.c
index 0e2b97d4..90c9ea8d 100644
--- a/profile.c
+++ b/profile.c
@@ -30,8 +30,11 @@ int load_profile(const char *profile)
 
 	ops = find_profile(profile);
 	if (ops) {
-		ops->prep_cmd();
-		add_job_opts(ops->cmdline);
+		if (ops->prep_cmd()) {
+			log_err("fio: profile %s prep failed\n", profile);
+			return 1;
+		}
+		add_job_opts(ops->cmdline, FIO_CLIENT_TYPE_CLI);
 		return 0;
 	}
 
@@ -42,13 +45,14 @@ int load_profile(const char *profile)
 static int add_profile_options(struct profile_ops *ops)
 {
 	struct fio_option *o;
-	
+
 	if (!ops->options)
 		return 0;
 
 	o = ops->options;
 	while (o->name) {
 		o->prof_name = ops->name;
+		o->prof_opts = ops->opt_data;
 		if (add_option(o))
 			return 1;
 		o++;
@@ -93,6 +97,26 @@ 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;
+		td->flags |= TD_F_PROFILE_OPS;
+	}
+}
+
+int profile_td_init(struct thread_data *td)
+{
+	struct prof_io_ops *ops = &td->prof_io_ops;
+
+	if (ops->td_init)
+		return ops->td_init(td);
+
+	return 0;
+}
+
+void profile_td_exit(struct thread_data *td)
+{
+	struct prof_io_ops *ops = &td->prof_io_ops;
+
+	if (ops->td_exit)
+		ops->td_exit(td);
 }