projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ci_and_configure' of https://github.com/sitsofe/fio
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index db043e4acce6a5c6b81a216caed5eba6ca2d587a..fb4180a3bc35f16cf6a0463b01be1ff9b9e7f347 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-37,7
+37,7
@@
static bool random_map_free(struct fio_file *f, const uint64_t block)
*/
static void mark_random_map(struct thread_data *td, struct io_u *io_u)
{
*/
static void mark_random_map(struct thread_data *td, struct io_u *io_u)
{
- unsigned int min_bs = td->o.
rw_min_bs
;
+ unsigned int min_bs = td->o.
min_bs[io_u->ddir]
;
struct fio_file *f = io_u->file;
unsigned int nr_blocks;
uint64_t block;
struct fio_file *f = io_u->file;
unsigned int nr_blocks;
uint64_t block;
@@
-662,7
+662,7
@@
int io_u_quiesce(struct thread_data *td)
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
{
enum fio_ddir odir = ddir ^ 1;
static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
{
enum fio_ddir odir = ddir ^ 1;
-
long
usec;
+
uint64_t
usec;
uint64_t now;
assert(ddir_rw(ddir));
uint64_t now;
assert(ddir_rw(ddir));
@@
-1779,7
+1779,7
@@
static void account_io_completion(struct thread_data *td, struct io_u *io_u,
if (td->parent)
td = td->parent;
if (td->parent)
td = td->parent;
- if (!td->o.stats)
+ if (!td->o.stats
|| td_ioengine_flagged(td, FIO_NOSTATS)
)
return;
if (no_reduce)
return;
if (no_reduce)