projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Make it easier to match up filename and job number
[fio.git]
/
init.c
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')
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
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);
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->numjobs = 1;
td_new->stonewall = 0;
- td_new->jobnum = numjobs;
job_add_num = numjobs - 1;
if (add_job(td_new, jobname, job_add_num))
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
*/
/*
* Seperate multiple job files by a stonewall
*/
- if (stonewall) {
+ if (
!global &&
stonewall) {
td->stonewall = stonewall;
stonewall = 0;
}
td->stonewall = stonewall;
stonewall = 0;
}