projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/filecreate: don't use file hash
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 375413f4b6d230e38432484179327736ae2de060..58c23202bd3d20bb1eee1b4fbcf1731d9bf312ea 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;
@@
-552,9
+552,9
@@
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;
- frand_max = rand_max(&td->bsrange_state);
+ frand_max = rand_max(&td->bsrange_state
[ddir]
);
do {
do {
- r = __rand(&td->bsrange_state);
+ r = __rand(&td->bsrange_state
[ddir]
);
if (!td->o.bssplit_nr[ddir]) {
buflen = 1 + (unsigned int) ((double) maxbs *
if (!td->o.bssplit_nr[ddir]) {
buflen = 1 + (unsigned int) ((double) maxbs *
@@
-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));
@@
-1602,7
+1602,7
@@
static void small_content_scramble(struct io_u *io_u)
unsigned int i, nr_blocks = io_u->buflen / 512;
uint64_t boffset;
unsigned int offset;
unsigned int i, nr_blocks = io_u->buflen / 512;
uint64_t boffset;
unsigned int offset;
-
void
*p, *end;
+
char
*p, *end;
if (!nr_blocks)
return;
if (!nr_blocks)
return;
@@
-2188,7
+2188,7
@@
int do_io_u_trim(const struct thread_data *td, struct io_u *io_u)
struct fio_file *f = io_u->file;
int ret;
struct fio_file *f = io_u->file;
int ret;
- ret = os_trim(f
->fd
, io_u->offset, io_u->xfer_buflen);
+ ret = os_trim(f, io_u->offset, io_u->xfer_buflen);
if (!ret)
return io_u->xfer_buflen;
if (!ret)
return io_u->xfer_buflen;