stats: Add a function to report completion latency percentiles

[fio.git] / init.c

diff --git a/init.c b/init.c
index b96350a66f09d64e3d39602f0717801ef92c9c37..a920c6ed87e71e8b0399708fcb12ac0d6361c88a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -22,12 +22,12 @@
 
 #include "lib/getopt.h"
 
-static char fio_version_string[] = "fio 1.51";
+static char fio_version_string[] = "fio 1.57";
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
 static char **ini_file;
-static int max_jobs = MAX_JOBS;
+static int max_jobs = FIO_MAX_JOBS;
 static int dump_cmdline;
 
 static struct thread_data def_thread;
@@ -47,7 +47,6 @@ int warnings_fatal = 0;
 int write_bw_log = 0;
 int read_only = 0;
 
-static int def_timeout;
 static int write_lat_log;
 
 static int prev_group_jobs;
@@ -64,85 +63,90 @@ static char cmd_optstr[256];
  */
 static struct option l_opts[FIO_NR_OPTIONS] = {
        {
-               .name           = "output",
+               .name           = (char *) "output",
                .has_arg        = required_argument,
                .val            = 'o',
        },
        {
-               .name           = "timeout",
+               .name           = (char *) "timeout",
                .has_arg        = required_argument,
                .val            = 't',
        },
        {
-               .name           = "latency-log",
+               .name           = (char *) "latency-log",
                .has_arg        = required_argument,
                .val            = 'l',
        },
        {
-               .name           = "bandwidth-log",
+               .name           = (char *) "bandwidth-log",
                .has_arg        = required_argument,
                .val            = 'b',
        },
        {
-               .name           = "minimal",
+               .name           = (char *) "minimal",
                .has_arg        = optional_argument,
                .val            = 'm',
        },
        {
-               .name           = "version",
+               .name           = (char *) "version",
                .has_arg        = no_argument,
                .val            = 'v',
        },
        {
-               .name           = "help",
+               .name           = (char *) "help",
                .has_arg        = no_argument,
                .val            = 'h',
        },
        {
-               .name           = "cmdhelp",
+               .name           = (char *) "cmdhelp",
                .has_arg        = optional_argument,
                .val            = 'c',
        },
        {
-               .name           = "showcmd",
+               .name           = (char *) "showcmd",
                .has_arg        = no_argument,
                .val            = 's',
        },
        {
-               .name           = "readonly",
+               .name           = (char *) "readonly",
                .has_arg        = no_argument,
                .val            = 'r',
        },
        {
-               .name           = "eta",
+               .name           = (char *) "eta",
                .has_arg        = required_argument,
                .val            = 'e',
        },
        {
-               .name           = "debug",
+               .name           = (char *) "debug",
                .has_arg        = required_argument,
                .val            = 'd',
        },
        {
-               .name           = "section",
+               .name           = (char *) "section",
                .has_arg        = required_argument,
                .val            = 'x',
        },
        {
-               .name           = "alloc-size",
+               .name           = (char *) "alloc-size",
                .has_arg        = required_argument,
                .val            = 'a',
        },
        {
-               .name           = "profile",
+               .name           = (char *) "profile",
                .has_arg        = required_argument,
                .val            = 'p',
        },
        {
-               .name           = "warnings-fatal",
+               .name           = (char *) "warnings-fatal",
                .has_arg        = no_argument,
                .val            = 'w',
        },
+       {
+               .name           = (char *) "max-jobs",
+               .has_arg        = required_argument,
+               .val            = 'j',
+       },
        {
                .name           = NULL,
        },
@@ -191,7 +195,7 @@ static void put_job(struct thread_data *td)
 {
        if (td == &def_thread)
                return;
-       
+
        profile_td_exit(td);
 
        if (td->error)
@@ -568,7 +572,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        }
 
        if (profile_td_init(td))
-               return 1;
+               goto err;
 
        engine = get_engine_name(td->o.ioengine);
        td->io_ops = load_ioengine(td, engine);
@@ -612,6 +616,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
        td->mutex = fio_mutex_init(0);
 
+       td->ts.clat_percentiles = td->o.clat_percentiles;
+       if (td->o.overwrite_plist)
+               td->ts.percentile_list = td->o.percentile_list;
+       else
+               td->ts.percentile_list = NULL;
+
        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;
        td->ts.lat_stat[0].min_val = td->ts.lat_stat[1].min_val = ULONG_MAX;
@@ -771,7 +781,7 @@ static int is_empty_or_comment(char *line)
                        return 1;
                if (line[i] == '#')
                        return 1;
-               if (!isspace(line[i]) && !iscntrl(line[i]))
+               if (!isspace((int) line[i]) && !iscntrl((int) line[i]))
                        return 0;
        }
 
@@ -835,7 +845,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
                if (is_empty_or_comment(p))
                        continue;
-               if (sscanf(p, "[%255s]", name) != 1) {
+               if (sscanf(p, "[%255[^\n]]", name) != 1) {
                        if (inside_skip)
                                continue;
                        log_err("fio: option <%s> outside of [] job section\n",
@@ -946,8 +956,6 @@ static int fill_def_thread(void)
         * fill default options
         */
        fio_fill_default_options(&def_thread);
-
-       def_thread.o.timeout = def_timeout;
        return 0;
 }
 
@@ -1019,6 +1027,7 @@ static int setup_thread_area(void)
 
 static void usage(const char *name)
 {
+       printf("%s\n", fio_version_string);
        printf("%s [options] [job options] <job file(s)>\n", name);
        printf("\t--debug=options\tEnable debug logging\n");
        printf("\t--output\tWrite output to file\n");
@@ -1039,6 +1048,7 @@ static void usage(const char *name)
        printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb"
                " (def 1024)\n");
        printf("\t--warnings-fatal Fio parser warnings are fatal\n");
+       printf("\t--max-jobs\tMaximum number of threads/processes to support\n");
        printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
        printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
 }
@@ -1154,7 +1164,7 @@ static int parse_cmd_line(int argc, char *argv[])
                        smalloc_pool_size = atoi(optarg);
                        break;
                case 't':
-                       def_timeout = atoi(optarg);
+                       def_thread.o.timeout = atoi(optarg);
                        break;
                case 'l':
                        write_lat_log = 1;
@@ -1222,10 +1232,8 @@ static int parse_cmd_line(int argc, char *argv[])
 
                        if (!strncmp(opt, "name", 4) && td) {
                                ret = add_job(td, td->o.name ?: "fio", 0);
-                               if (ret) {
-                                       put_job(td);
+                               if (ret)
                                        return 0;
-                               }
                                td = NULL;
                        }
                        if (!td) {
@@ -1249,6 +1257,14 @@ static int parse_cmd_line(int argc, char *argv[])
                case 'w':
                        warnings_fatal = 1;
                        break;
+               case 'j':
+                       max_jobs = atoi(optarg);
+                       if (!max_jobs || max_jobs > REAL_MAX_JOBS) {
+                               log_err("fio: invalid max jobs: %d\n", max_jobs);
+                               do_exit++;
+                               exit_val = 1;
+                       }
+                       break;
                default:
                        do_exit++;
                        exit_val = 1;
@@ -1262,8 +1278,6 @@ static int parse_cmd_line(int argc, char *argv[])
        if (td) {
                if (!ret)
                        ret = add_job(td, td->o.name ?: "fio", 0);
-               if (ret)
-                       put_job(td);
        }
 
        while (optind < argc) {