projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Further improve child exit reaping
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index f4125b13c5f05c1064d07d5e12bf72d5295a034e..1dec2bbd324209acf04b72e1430c4d1d5d9db2cb 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-639,7
+639,7
@@
static void fixup_options(struct thread_data *td)
static char *to_kmg(unsigned int val)
{
char *buf = malloc(32);
static char *to_kmg(unsigned int val)
{
char *buf = malloc(32);
- char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
+ char post[] = { 0, 'K', 'M', 'G', 'P',
'E',
0 };
char *p = post;
do {
char *p = post;
do {
@@
-679,7
+679,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
td->io_ops->flags |= FIO_RAWIO;
td->filetype = FIO_TYPE_FILE;
td->io_ops->flags |= FIO_RAWIO;
td->filetype = FIO_TYPE_FILE;
- if (
!stat(job
name, &sb)) {
+ if (
td->filename && !lstat(td->file
name, &sb)) {
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
@@
-845,7
+845,7
@@
int init_random_state(struct thread_data *td)
return 0;
if (td->rand_repeatable)
return 0;
if (td->rand_repeatable)
- seeds[3] = FIO_RANDSEED;
+ seeds[3] = FIO_RANDSEED
* td->thread_number
;
if (!td->norandommap) {
for_each_file(td, f, i) {
if (!td->norandommap) {
for_each_file(td, f, i) {