[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 eeef3052ec08056ed1ae96829e603de39775bb1f..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)
 {
@@ -164,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" };
@@ -248,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
@@ -264,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;
@@ -279,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;
@@ -807,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;
@@ -858,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;
        }