projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 1.36
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 873a0ba68e4884f50f457bb0786efe32ca8e1878..b5ced8898311d7684103b47dcf552d62ee8c59ef 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-20,7
+20,7
@@
#include "filehash.h"
#include "verify.h"
#include "filehash.h"
#include "verify.h"
-static char fio_version_string[] = "fio 1.36
-rc1
";
+static char fio_version_string[] = "fio 1.36";
#define FIO_RANDSEED (0xb1899bedUL)
#define FIO_RANDSEED (0xb1899bedUL)
@@
-181,6
+181,8
@@
static struct thread_data *get_new_job(int global, struct thread_data *parent)
td = &threads[thread_number++];
*td = *parent;
td = &threads[thread_number++];
*td = *parent;
+ td->o.uid = td->o.gid = -1U;
+
dup_files(td, parent);
options_mem_dupe(td);
dup_files(td, parent);
options_mem_dupe(td);
@@
-203,21
+205,19
@@
static void put_job(struct thread_data *td)
static int __setup_rate(struct thread_data *td, enum fio_ddir ddir)
{
unsigned int bs = td->o.min_bs[ddir];
static int __setup_rate(struct thread_data *td, enum fio_ddir ddir)
{
unsigned int bs = td->o.min_bs[ddir];
- unsigned long long rate;
- unsigned long ios_per_msec;
+ unsigned long long bytes_per_sec;
- if (td->o.rate[ddir]) {
- rate = td->o.rate[ddir];
- ios_per_msec = (rate * 1000LL) / bs;
- } else
- ios_per_msec = td->o.rate_iops[ddir] * 1000UL;
+ if (td->o.rate[ddir])
+ bytes_per_sec = td->o.rate[ddir];
+ else
+ bytes_per_sec = td->o.rate_iops[ddir] * bs;
- if (!
ios_per_m
sec) {
+ if (!
bytes_per_
sec) {
log_err("rate lower than supported\n");
return -1;
}
log_err("rate lower than supported\n");
return -1;
}
- td->rate_
usec_cycle[ddir] = 1000000000ULL / ios_per_m
sec;
+ td->rate_
nsec_cycle[ddir] = 1000000000ULL / bytes_per_
sec;
td->rate_pending_usleep[ddir] = 0;
return 0;
}
td->rate_pending_usleep[ddir] = 0;
return 0;
}