Confusion between mutex and semaphore naming

[fio.git] / init.c

diff --git a/init.c b/init.c
index d559a7ac94abb46d7a4b2bdd0cbed363503b80f2..d860179df6dcbe98f43f60d5a8ba999609b87824 100644 (file)
--- a/init.c
+++ b/init.c
@@ -17,7 +17,7 @@
 #include "fio.h"
 #include "parse.h"
 
-static char fio_version_string[] = "fio 1.18.1";
+static char fio_version_string[] = "fio 1.19";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
@@ -466,7 +466,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                        f->real_file_size = -1ULL;
        }
 
-       td->mutex = fio_sem_init(0);
+       td->mutex = fio_mutex_init(0);
 
        td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
        td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
@@ -811,10 +811,12 @@ struct debug_level debug_levels[] = {
        { .name = "mem",        .shift = FD_MEM, },
        { .name = "blktrace",   .shift = FD_BLKTRACE },
        { .name = "verify",     .shift = FD_VERIFY },
+       { .name = "random",     .shift = FD_RANDOM },
+       { .name = "parse",      .shift = FD_PARSE },
        { },
 };
 
-static void set_debug(const char *string)
+static int set_debug(const char *string)
 {
        struct debug_level *dl;
        char *p = (char *) string;
@@ -830,10 +832,10 @@ static void set_debug(const char *string)
                        log_info("%s,", dl->name);
                }
                log_info("all\n");
-               return;
+               return 1;
        } else if (!strcmp(string, "all")) {
                fio_debug = ~0UL;
-               return;
+               return 0;
        }
 
        while ((opt = strsep(&p, ",")) != NULL) {
@@ -852,18 +854,20 @@ static void set_debug(const char *string)
                if (!found)
                        log_err("fio: debug mask %s not found\n", opt);
        }
+       return 0;
 }
 #else
 static void set_debug(const char *string)
 {
        log_err("fio: debug tracing not included in build\n");
+       return 1;
 }
 #endif
 
 static int parse_cmd_line(int argc, char *argv[])
 {
        struct thread_data *td = NULL;
-       int c, ini_idx = 0, lidx, ret = 0, bad_options = 0;
+       int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0;
 
        while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
                switch (c) {
@@ -908,12 +912,14 @@ static int parse_cmd_line(int argc, char *argv[])
                                eta_print = FIO_ETA_NEVER;
                        break;
                case 'd':
-                       set_debug(optarg);
+                       if (set_debug(optarg))
+                               do_exit++;
                        break;
                case 'x':
                        if (!strcmp(optarg, "global")) {
                                log_err("fio: can't use global as only section\n");
-                               bad_options++;
+                               do_exit++;
+                               exit_val = 1;
                                break;
                        }
                        if (job_section)
@@ -951,13 +957,14 @@ static int parse_cmd_line(int argc, char *argv[])
                        break;
                }
                default:
-                       bad_options++;
+                       do_exit++;
+                       exit_val = 1;
                        break;
                }
        }
 
-       if (bad_options)
-               exit(1);
+       if (do_exit)
+               exit(exit_val);
 
        if (td) {
                if (!ret)