projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/btrace2fio: don't dec inflight for requeue
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 612057d15762dfa13e7e48bc48e99658f9e8880a..e8894d5dca62ff07a9e39174191ae877490793b5 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-90,21
+90,11
@@
static int __get_next_rand_offset(struct thread_data *td, struct fio_file *f,
return 1;
if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE) {
return 1;
if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE) {
- uint64_t rmax;
-
- rmax = td->o.use_os_rand ? OS_RAND_MAX : FRAND_MAX;
-
- if (td->o.use_os_rand) {
- rmax = OS_RAND_MAX;
- r = os_random_long(&td->random_state);
- } else {
- rmax = FRAND_MAX;
- r = __rand(&td->__random_state);
- }
+ r = __rand(&td->random_state);
dprint(FD_RANDOM, "off rand %llu\n", (unsigned long long) r);
dprint(FD_RANDOM, "off rand %llu\n", (unsigned long long) r);
- *b = lastb * (r / ((uint64_t)
rmax
+ 1.0));
+ *b = lastb * (r / ((uint64_t)
FRAND_MAX
+ 1.0));
} else {
uint64_t off = 0;
} else {
uint64_t off = 0;
@@
-200,13
+190,8
@@
static int should_do_random(struct thread_data *td, enum fio_ddir ddir)
if (td->o.perc_rand[ddir] == 100)
return 1;
if (td->o.perc_rand[ddir] == 100)
return 1;
- if (td->o.use_os_rand) {
- r = os_random_long(&td->seq_rand_state[ddir]);
- v = 1 + (int) (100.0 * (r / (OS_RAND_MAX + 1.0)));
- } else {
- r = __rand(&td->__seq_rand_state[ddir]);
- v = 1 + (int) (100.0 * (r / (FRAND_MAX + 1.0)));
- }
+ r = __rand(&td->seq_rand_state[ddir]);
+ v = 1 + (int) (100.0 * (r / (FRAND_MAX + 1.0)));
return v <= td->o.perc_rand[ddir];
}
return v <= td->o.perc_rand[ddir];
}
@@
-221,7
+206,6
@@
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
return get_off_from_method(td, f, ddir, b);
if (!flist_empty(&td->next_rand_list)) {
return get_off_from_method(td, f, ddir, b);
if (!flist_empty(&td->next_rand_list)) {
- struct rand_off *r;
fetch:
r = flist_first_entry(&td->next_rand_list, struct rand_off, list);
flist_del(&r->list);
fetch:
r = flist_first_entry(&td->next_rand_list, struct rand_off, list);
flist_del(&r->list);
@@
-436,7
+420,7
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
int ddir = io_u->ddir;
unsigned int buflen = 0;
unsigned int minbs, maxbs;
int ddir = io_u->ddir;
unsigned int buflen = 0;
unsigned int minbs, maxbs;
- unsigned long r
, rand_max
;
+ unsigned long r;
assert(ddir_rw(ddir));
assert(ddir_rw(ddir));
@@
-455,20
+439,12
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
if (!io_u_fits(td, io_u, minbs))
return 0;
if (!io_u_fits(td, io_u, minbs))
return 0;
- if (td->o.use_os_rand)
- rand_max = OS_RAND_MAX;
- else
- rand_max = FRAND_MAX;
-
do {
do {
- if (td->o.use_os_rand)
- r = os_random_long(&td->bsrange_state);
- else
- r = __rand(&td->__bsrange_state);
+ r = __rand(&td->bsrange_state);
if (!td->o.bssplit_nr[ddir]) {
buflen = 1 + (unsigned int) ((double) maxbs *
if (!td->o.bssplit_nr[ddir]) {
buflen = 1 + (unsigned int) ((double) maxbs *
- (r / (
rand_max
+ 1.0)));
+ (r / (
FRAND_MAX
+ 1.0)));
if (buflen < minbs)
buflen = minbs;
} else {
if (buflen < minbs)
buflen = minbs;
} else {
@@
-480,7
+456,7
@@
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u,
buflen = bsp->bs;
perc += bsp->perc;
buflen = bsp->bs;
perc += bsp->perc;
- if ((r <= ((
rand_max
/ 100L) * perc)) &&
+ if ((r <= ((
FRAND_MAX
/ 100L) * perc)) &&
io_u_fits(td, io_u, buflen))
break;
}
io_u_fits(td, io_u, buflen))
break;
}
@@
-529,13
+505,8
@@
static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
unsigned int v;
unsigned long r;
unsigned int v;
unsigned long r;
- if (td->o.use_os_rand) {
- r = os_random_long(&td->rwmix_state);
- v = 1 + (int) (100.0 * (r / (OS_RAND_MAX + 1.0)));
- } else {
- r = __rand(&td->__rwmix_state);
- v = 1 + (int) (100.0 * (r / (FRAND_MAX + 1.0)));
- }
+ r = __rand(&td->rwmix_state);
+ v = 1 + (int) (100.0 * (r / (FRAND_MAX + 1.0)));
if (v <= td->o.rwmix[DDIR_READ])
return DDIR_READ;
if (v <= td->o.rwmix[DDIR_READ])
return DDIR_READ;
@@
-609,8
+580,8
@@
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
if (td_rw(td) && __should_check_rate(td, odir))
td->rate_pending_usleep[odir] -= usec;
if (td_rw(td) && __should_check_rate(td, odir))
td->rate_pending_usleep[odir] -= usec;
- if (ddir
_trim(ddir)
)
- return
ddir
;
+ if (ddir
== DDIR_TRIM
)
+ return
DDIR_TRIM
;
return ddir;
}
return ddir;
}
@@
-987,15
+958,9
@@
static struct fio_file *get_next_file_rand(struct thread_data *td,
int opened = 0;
unsigned long r;
int opened = 0;
unsigned long r;
- if (td->o.use_os_rand) {
- r = os_random_long(&td->next_file_state);
- fno = (unsigned int) ((double) td->o.nr_files
- * (r / (OS_RAND_MAX + 1.0)));
- } else {
- r = __rand(&td->__next_file_state);
- fno = (unsigned int) ((double) td->o.nr_files
+ r = __rand(&td->next_file_state);
+ fno = (unsigned int) ((double) td->o.nr_files
* (r / (FRAND_MAX + 1.0)));
* (r / (FRAND_MAX + 1.0)));
- }
f = td->files[fno];
if (fio_file_done(f))
f = td->files[fno];
if (fio_file_done(f))