X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=init.c;h=7a9284299a6099a69134155f7d9e914de4831b14;hp=92b3e5b2a4a78f50b669fb9312580d7124bbb9cf;hb=3a5f6bde1d14faa9e60cde1c8b45c101bc462f34;hpb=7351f402b131fc4ad4e25bd2609a255a1ab4e97c diff --git a/init.c b/init.c index 92b3e5b2..7a928429 100644 --- a/init.c +++ b/init.c @@ -45,7 +45,6 @@ int exitall_on_terminate = 0; int output_format = FIO_OUTPUT_NORMAL; int eta_print = FIO_ETA_AUTO; int eta_new_line = 0; -unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; char **job_sections = NULL; @@ -560,6 +559,13 @@ static int fixup_options(struct thread_data *td) } } + if (!o->unit_base) { + if (td->io_ops->flags & FIO_BIT_BASED) + o->unit_base = 1; + else + o->unit_base = 8; + } + #ifndef CONFIG_FDATASYNC if (o->fdatasync_blocks) { log_info("fio: this platform does not support fdatasync()" @@ -913,11 +919,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num) if (ioengine_load(td)) goto err; - if (o->use_thread) - nr_thread++; - else - nr_process++; - if (o->odirect) td->io_ops->flags |= FIO_RAWIO;