X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=profile.c;h=5d0b866708559c1adb5253306c83fe4fc50e3fd8;hp=354b06d3c2e923dd2391b68be0ad224ffe94f020;hb=d1415111eebe7a95d8de1af1ec61e80f9d534552;hpb=07b3232de97ac32a873f0b5d17c8f49c18ed3ae7

diff --git a/profile.c b/profile.c
index 354b06d3..5d0b8667 100644
--- a/profile.c
+++ b/profile.c
@@ -6,13 +6,11 @@
 
 static FLIST_HEAD(profile_list);
 
-int load_profile(const char *profile)
+struct profile_ops *find_profile(const char *profile)
 {
-	struct profile_ops *ops;
+	struct profile_ops *ops = NULL;
 	struct flist_head *n;
 
-	dprint(FD_PROFILE, "loading profile '%s'\n", profile);
-
 	flist_for_each(n, &profile_list) {
 		ops = flist_entry(n, struct profile_ops, list);
 		if (!strcmp(profile, ops->name))
@@ -21,9 +19,22 @@ int load_profile(const char *profile)
 		ops = NULL;
 	}
 
+	return ops;
+}
+
+int load_profile(const char *profile)
+{
+	struct profile_ops *ops;
+
+	dprint(FD_PROFILE, "loading profile '%s'\n", 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;
 	}
 
@@ -34,7 +45,7 @@ int load_profile(const char *profile)
 static int add_profile_options(struct profile_ops *ops)
 {
 	struct fio_option *o;
-	
+
 	if (!ops->options)
 		return 0;
 
@@ -54,11 +65,15 @@ int register_profile(struct profile_ops *ops)
 	int ret;
 
 	dprint(FD_PROFILE, "register profile '%s'\n", ops->name);
-	flist_add_tail(&ops->list, &profile_list);
+
 	ret = add_profile_options(ops);
-	if (ret)
-		invalidate_profile_options(ops->name);
+	if (!ret) {
+		flist_add_tail(&ops->list, &profile_list);
+		add_opt_posval("profile", ops->name, ops->desc);
+		return 0;
+	}
 
+	invalidate_profile_options(ops->name);
 	return ret;
 }
 
@@ -67,4 +82,40 @@ void unregister_profile(struct profile_ops *ops)
 	dprint(FD_PROFILE, "unregister profile '%s'\n", ops->name);
 	flist_del(&ops->list);
 	invalidate_profile_options(ops->name);
+	del_opt_posval("profile", ops->name);
+}
+
+void profile_add_hooks(struct thread_data *td)
+{
+	struct profile_ops *ops;
+
+	if (!exec_profile)
+		return;
+
+	ops = find_profile(exec_profile);
+	if (!ops)
+		return;
+
+	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);
 }