flow: add ability for weight-based flow control on multiple jobs

[fio.git] / options.c

diff --git a/options.c b/options.c
index 251ad2c1adff50e1068c70eb9b929f7288cc079d..067597ecde48807c39dd03b2aceeeaa654467953 100644 (file)
--- a/options.c
+++ b/options.c
@@ -4696,26 +4696,20 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
        {
                .name   = "flow",
                .lname  = "I/O flow weight",
-               .type   = FIO_OPT_INT,
+               .type   = FIO_OPT_ULL,
                .off1   = offsetof(struct thread_options, flow),
                .help   = "Weight for flow control of this job",
                .parent = "flow_id",
                .hide   = 1,
                .def    = "0",
+               .maxval = FLOW_MAX_WEIGHT,
                .category = FIO_OPT_C_IO,
                .group  = FIO_OPT_G_IO_FLOW,
        },
        {
                .name   = "flow_watermark",
                .lname  = "I/O flow watermark",
-               .type   = FIO_OPT_INT,
-               .off1   = offsetof(struct thread_options, flow_watermark),
-               .help   = "High watermark for flow control. This option"
-                       " should be set to the same value for all threads"
-                       " with non-zero flow.",
-               .parent = "flow_id",
-               .hide   = 1,
-               .def    = "1024",
+               .type   = FIO_OPT_SOFT_DEPRECATED,
                .category = FIO_OPT_C_IO,
                .group  = FIO_OPT_G_IO_FLOW,
        },