static int str_prioclass_cb(void *data, unsigned int *val)
{
struct thread_data *td = data;
+ unsigned short mask;
+
+ /*
+ * mask off old class bits, str_prio_cb() may have set a default class
+ */
+ mask = (1 << IOPRIO_CLASS_SHIFT) - 1;
+ td->ioprio &= mask;
td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
return 0;
struct thread_data *td = data;
td->ioprio |= *val;
+
+ /*
+ * If no class is set, assume BE
+ */
+ if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
+ td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+
return 0;
}
#endif
return 0;
}
-static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
+static void fill_cpu_mask(os_cpu_mask_t *cpumask, int cpu)
{
#ifdef FIO_HAVE_CPU_AFFINITY
unsigned int i;
- CPU_ZERO(&cpumask);
+ CPU_ZERO(cpumask);
- for (i = 0; i < sizeof(int) * 8; i++) {
+ for (i = 0; i < sizeof(int) * 8; i++)
if ((1 << i) & cpu)
- CPU_SET(i, &cpumask);
- }
+ CPU_SET(i, cpumask);
#endif
}
{
struct thread_data *td = data;
- fill_cpu_mask(td->o.cpumask, *val);
+ fill_cpu_mask(&td->o.cpumask, *val);
+ td->o.cpumask_set = 1;
return 0;
}
.help = "Stop workload when this amount of time has passed",
.def = "0",
},
+ {
+ .name = "time_based",
+ .type = FIO_OPT_STR_SET,
+ .off1 = td_var_offset(time_based),
+ .help = "Keep running until runtime/timeout is met",
+ },
{
.name = "mem",
.alias = "iomem",
.off1 = td_var_offset(zero_buffers),
.help = "Init IO buffers to all zeroes",
},
+#ifdef FIO_HAVE_DISK_UTIL
+ {
+ .name = "disk_util",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(do_disk_util),
+ .help = "Log disk utilization stats",
+ .def = "1",
+ },
+#endif
{
.name = NULL,
},