cmdprio: add mode to make the logic easier to reason about

[fio.git] / engines / cmdprio.h

diff --git a/engines/cmdprio.h b/engines/cmdprio.h
index e3b42182cdac7683b751b995a388efb17255f15c..7e4fcf6c58e4113436b19cc8cf3b1965889c6b0e 100644 (file)
--- a/engines/cmdprio.h
+++ b/engines/cmdprio.h
@@ -8,46 +8,30 @@
 
 #include "../fio.h"
 
+/* read and writes only, no trim */
+#define CMDPRIO_RWDIR_CNT 2
+
+enum {
+       CMDPRIO_MODE_NONE,
+       CMDPRIO_MODE_PERC,
+       CMDPRIO_MODE_BSSPLIT,
+};
+
 struct cmdprio {
-       unsigned int percentage[DDIR_RWDIR_CNT];
-       unsigned int class[DDIR_RWDIR_CNT];
-       unsigned int level[DDIR_RWDIR_CNT];
+       unsigned int percentage[CMDPRIO_RWDIR_CNT];
+       unsigned int class[CMDPRIO_RWDIR_CNT];
+       unsigned int level[CMDPRIO_RWDIR_CNT];
+       unsigned int bssplit_nr[CMDPRIO_RWDIR_CNT];
+       struct bssplit *bssplit[CMDPRIO_RWDIR_CNT];
+       unsigned int mode;
 };
 
-static int fio_cmdprio_init(struct thread_data *td, struct cmdprio *cmdprio,
-                           bool *has_cmdprio)
-{
-       struct thread_options *to = &td->o;
-       bool has_cmdprio_percentage = false;
-       int i;
-
-       /*
-        * If cmdprio_percentage is set and cmdprio_class is not set,
-        * default to RT priority class.
-        */
-       for (i = 0; i < DDIR_RWDIR_CNT; i++) {
-               if (cmdprio->percentage[i]) {
-                       if (!cmdprio->class[i])
-                               cmdprio->class[i] = IOPRIO_CLASS_RT;
-                       has_cmdprio_percentage = true;
-               }
-       }
-
-       /*
-        * Check for option conflicts
-        */
-       if (has_cmdprio_percentage &&
-           (fio_option_is_set(to, ioprio) ||
-            fio_option_is_set(to, ioprio_class))) {
-               log_err("%s: cmdprio_percentage option and mutually exclusive "
-                       "prio or prioclass option is set, exiting\n",
-                       to->name);
-               return 1;
-       }
-
-       *has_cmdprio = has_cmdprio_percentage;
-
-       return 0;
-}
+int fio_cmdprio_bssplit_parse(struct thread_data *td, const char *input,
+                             struct cmdprio *cmdprio);
+
+bool fio_cmdprio_set_ioprio(struct thread_data *td, struct cmdprio *cmdprio,
+                           struct io_u *io_u);
+
+int fio_cmdprio_init(struct thread_data *td, struct cmdprio *cmdprio);
 
 #endif