Make lockmem a per job option

[fio.git] / init.c

diff --git a/init.c b/init.c
index 0da878d52ff135ebe20efe3081742dc674e14252..9e2d1131d276637983094c1cbdf5afbb9172225a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -26,6 +26,7 @@
 #include "idletime.h"
 
 #include "lib/getopt.h"
+#include "lib/strcasestr.h"
 
 const char fio_version_string[] = FIO_VERSION;
 
@@ -44,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;
@@ -559,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()"
@@ -838,7 +845,7 @@ static char *make_filename(char *buf, struct thread_options *o,
                        size_t pre_len, post_start = 0;
                        char *str, *dst = copy;
 
-                       str = strstr(buf, f->keyword);
+                       str = strcasestr(buf, f->keyword);
                        if (!str)
                                break;