[PATCH] Make it easier to match up filename and job number

diff --git a/fio.h b/fio.h
index 2d57227c53cf13a68d15131d55e23376308d9295..49603ebc70f1cbbda6db2cf7ee15c39c93c97f14 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -191,7 +191,6 @@ struct thread_data {
        unsigned int numjobs;
        unsigned int iodepth;
        os_cpu_mask_t cpumask;
-       unsigned int jobnum;
        unsigned int iolog;
        unsigned int read_iolog;
        unsigned int write_iolog;

diff --git a/init.c b/init.c
index ee9ab7d2ab6772b95b718c7ff94afcb9315bae7f..570095a119dd7ed6154d4252054b54eabf8a3298 100644 (file)
--- a/init.c
+++ b/init.c
@@ -137,9 +137,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                char tmp[PATH_MAX];
 
                if (td->directory && td->directory[0] != '\0')
-                       sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->jobnum);
+                       sprintf(tmp, "%s/%s.%d", td->directory, jobname, td->thread_number);
                else
-                       sprintf(tmp, "%s.%d", jobname, td->jobnum);
+                       sprintf(tmp, "%s.%d", jobname, td->thread_number);
                td->file_name = strdup(tmp);
        } else
                td->file_name = strdup(jobname);
@@ -195,7 +195,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
                td_new->numjobs = 1;
                td_new->stonewall = 0;
-               td_new->jobnum = numjobs;
                job_add_num = numjobs - 1;
 
                if (add_job(td_new, jobname, job_add_num))
@@ -616,7 +615,7 @@ int parse_jobs_ini(char *file)
                /*
                 * Seperate multiple job files by a stonewall
                 */
-               if (stonewall) {
+               if (!global && stonewall) {
                        td->stonewall = stonewall;
                        stonewall = 0;
                }