t/run-fio-tests: integrate t/nvmept.py

[fio.git] / engines / cmdprio.h

diff --git a/engines/cmdprio.h b/engines/cmdprio.h
index 732b087e5df637633fb6ba6deac6d19f2649a3c8..755da8d0f8fff654bc81c5f0ca04ba02aa79ec1c 100644 (file)
--- a/engines/cmdprio.h
+++ b/engines/cmdprio.h
@@ -11,21 +11,50 @@
 /* read and writes only, no trim */
 #define CMDPRIO_RWDIR_CNT 2
 
-struct cmdprio {
+enum {
+       CMDPRIO_MODE_NONE,
+       CMDPRIO_MODE_PERC,
+       CMDPRIO_MODE_BSSPLIT,
+};
+
+struct cmdprio_prio {
+       int32_t prio;
+       uint32_t perc;
+       uint16_t clat_prio_index;
+};
+
+struct cmdprio_bsprio {
+       uint64_t bs;
+       uint32_t tot_perc;
+       unsigned int nr_prios;
+       struct cmdprio_prio *prios;
+};
+
+struct cmdprio_bsprio_desc {
+       struct cmdprio_bsprio *bsprios;
+       unsigned int nr_bsprios;
+};
+
+struct cmdprio_options {
        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];
+       char *bssplit_str;
 };
 
-int fio_cmdprio_bssplit_parse(struct thread_data *td, const char *input,
-                             struct cmdprio *cmdprio);
+struct cmdprio {
+       struct cmdprio_options *options;
+       struct cmdprio_prio perc_entry[CMDPRIO_RWDIR_CNT];
+       struct cmdprio_bsprio_desc bsprio_desc[CMDPRIO_RWDIR_CNT];
+       unsigned int mode;
+};
 
 bool fio_cmdprio_set_ioprio(struct thread_data *td, struct cmdprio *cmdprio,
                            struct io_u *io_u);
 
+void fio_cmdprio_cleanup(struct cmdprio *cmdprio);
+
 int fio_cmdprio_init(struct thread_data *td, struct cmdprio *cmdprio,
-                    bool *has_cmdprio);
+                    struct cmdprio_options *options);
 
 #endif