projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update fio io engine version
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 1077c27b1f07a43014ea527de0f985037a0a2083..31d3b14be50d0e124a8de277245cc043f4d1c624 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-100,7
+100,7
@@
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
int ddir, unsigned long long *b)
{
static int get_next_rand_offset(struct thread_data *td, struct fio_file *f,
int ddir, unsigned long long *b)
{
- unsigned long long max_blocks = f->
file
_size / td->o.min_bs[ddir];
+ unsigned long long max_blocks = f->
io
_size / td->o.min_bs[ddir];
unsigned long long r, rb;
int loops = 5;
unsigned long long r, rb;
int loops = 5;
@@
-250,7
+250,7
@@
static enum fio_ddir get_rw_ddir(struct thread_data *td)
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
*/
ddir = get_rand_ddir(td);
max_bytes = td->this_io_bytes[ddir];
- if (max_bytes >= (td->
io_
size * td->o.rwmix[ddir] / 100)) {
+ if (max_bytes >= (td->
o.
size * td->o.rwmix[ddir] / 100)) {
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
memcpy(&td->rw_end[ddir], &now, sizeof(now));
if (!td->rw_end_set[ddir]) {
td->rw_end_set[ddir] = 1;
memcpy(&td->rw_end[ddir], &now, sizeof(now));
@@
-310,7
+310,7
@@
static int fill_io_u(struct thread_data *td, struct io_u *io_u)
!(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
!(td->io_issues[DDIR_WRITE] % td->o.fsync_blocks) &&
td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
-
return 0
;
+
goto out
;
}
io_u->ddir = get_rw_ddir(td);
}
io_u->ddir = get_rw_ddir(td);
@@
-335,6
+335,7
@@
static int fill_io_u(struct thread_data *td, struct io_u *io_u)
/*
* If using a write iolog, store this entry.
*/
/*
* If using a write iolog, store this entry.
*/
+out:
if (td->o.write_iolog_file)
write_iolog_put(td, io_u);
if (td->o.write_iolog_file)
write_iolog_put(td, io_u);