[PATCH] Introduce an extra runstate for monitoring thread startup

[fio.git] / fio-ini.c

diff --git a/fio-ini.c b/fio-ini.c
index 109bc14950fca9d798defbd55a28cc939f907feb..f5297576faee0bb78af0f2c7f2285152007656aa 100644 (file)
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -50,6 +50,7 @@ int rate_quit = 0;
 int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 0;
+unsigned long long mlock_size = 0;
 
 static int setup_rate(struct thread_data *td)
 {
@@ -110,7 +111,10 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
                return NULL;
 
        td = &threads[thread_number++];
-       memset(td, 0, sizeof(*td));
+       if (parent)
+               *td = *parent;
+       else
+               memset(td, 0, sizeof(*td));
 
        td->fd = -1;
        td->thread_number = thread_number;
@@ -161,7 +165,7 @@ static void put_job(struct thread_data *td)
        thread_number--;
 }
 
-static int add_job(struct thread_data *td, const char *jobname)
+static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 {
        char *ddir_str[] = { "read", "write", "randread", "randwrite",
                             "rw", NULL, "randrw" };
@@ -245,7 +249,11 @@ static int add_job(struct thread_data *td, const char *jobname)
                setup_log(&td->bw_log);
 
        ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
-       printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+
+       if (!job_add_num)
+               printf("Client%d (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->thread_number, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_engine_name, td->iodepth);
+       else if (job_add_num == 1)
+               printf("...\n");
 
        /*
         * recurse add identical jobs, clear numjobs and stonewall options
@@ -261,8 +269,9 @@ static int add_job(struct thread_data *td, const char *jobname)
                td_new->numjobs = 1;
                td_new->stonewall = 0;
                td_new->jobnum = numjobs;
+               job_add_num = numjobs - 1;
 
-               if (add_job(td_new, jobname))
+               if (add_job(td_new, jobname, job_add_num))
                        goto err;
        }
        return 0;
@@ -276,7 +285,7 @@ int init_random_state(struct thread_data *td)
        unsigned long seed;
        int fd, num_maps, blocks;
 
-       fd = open("/dev/random", O_RDONLY);
+       fd = open("/dev/urandom", O_RDONLY);
        if (fd == -1) {
                td_verror(td, errno);
                return 1;
@@ -359,7 +368,7 @@ static int str_cnv(char *p, unsigned long long *val)
        if (*val == ULONG_MAX && errno == ERANGE)
                return 1;
 
-       *val *= get_mult(str[len - 2]);
+       *val *= get_mult(str[len - 1]);
        return 0;
 }
 
@@ -375,24 +384,18 @@ static void strip_blank_front(char **p)
 {
        char *s = *p;
 
-       while (isblank(*s))
+       while (isspace(*s))
                s++;
 }
 
 static void strip_blank_end(char *p)
 {
-       while (isblank(*p)) {
-               *p = '\0';
-               p--;
-       }
-}
+       char *s = p + strlen(p) - 1;
 
-static void terminate_line(char *p)
-{
-       while (*p != '\n' && *p != '\0')
-               p++;
+       while (isspace(*s) || iscntrl(*s))
+               s--;
 
-       *p = '\0';
+       *(s + 1) = '\0';
 }
 
 typedef int (str_cb_fn)(struct thread_data *, char *);
@@ -428,9 +431,6 @@ static int check_strstore(char *p, char *name, char *dest)
        strip_blank_front(&s);
 
        strcpy(dest, s);
-
-       s = dest + strlen(dest) - 1;
-       strip_blank_end(s);
        return 0;
 }
 
@@ -492,6 +492,9 @@ static int check_int(char *p, char *name, unsigned int *val)
 {
        char *str;
 
+       if (strncmp(p, name, strlen(name)))
+               return 1;
+
        str = strstr(p, name);
        if (!str)
                return 1;
@@ -630,7 +633,6 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
 
 static int str_iolog_cb(struct thread_data *td, char *file)
 {
-       terminate_line(file);
        strncpy(td->iolog_file, file, sizeof(td->iolog_file) - 1);
 
        return 0;
@@ -676,6 +678,8 @@ int parse_jobs_ini(char *file)
                                continue;
                        if (strstr(p, "["))
                                break;
+                       strip_blank_front(&p);
+                       strip_blank_end(p);
 
                        if (!check_int(p, "prio", &prio)) {
 #ifndef FIO_HAVE_IOPRIO
@@ -726,6 +730,7 @@ int parse_jobs_ini(char *file)
                        }
                        if (!check_int(p, "fsync", &td->fsync_blocks)) {
                                fgetpos(f, &off);
+                               td->end_fsync = 1;
                                continue;
                        }
                        if (!check_int(p, "startdelay", &td->start_delay)) {
@@ -760,6 +765,10 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
+                       if (!check_int(p, "end_fsync", &td->end_fsync)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }
                        if (!check_int(p, "loops", &td->loops)) {
                                fgetpos(f, &off);
                                continue;
@@ -804,6 +813,10 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
+                       if (!check_strcnv(p, "lockmem", &mlock_size)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }
                        if (!check_strstore(p, "directory", td->directory)) {
                                fgetpos(f, &off);
                                continue;
@@ -855,7 +868,7 @@ int parse_jobs_ini(char *file)
                }
                fsetpos(f, &off);
 
-               if (add_job(td, name))
+               if (add_job(td, name, 0))
                        return 1;
        }