Cache layout improvements

[fio.git] / profile.c

diff --git a/profile.c b/profile.c
index 354b06d3c2e923dd2391b68be0ad224ffe94f020..506462eb85373d795f745b0a4e479bd9a1937f1e 100644 (file)
--- 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,6 +19,16 @@ 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);
@@ -54,11 +62,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 +79,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);
 }