projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fusion-aw-sync: fixup GPL disclaimer
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 65a144d3ad517c86a5e45386bc818a2293f38d2a..db0a6dc50d2d509c5445e5cde26899628ea03e1d 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-15,7
+15,7
@@
struct io_completion_data {
int nr; /* input */
int error; /* output */
int nr; /* input */
int error; /* output */
- unsigned long bytes_done[
2];
/* output */
+ unsigned long bytes_done[
DDIR_RWDIR_CNT];
/* output */
struct timeval time; /* output */
};
struct timeval time; /* output */
};
@@
-251,12
+251,12
@@
static int get_next_rand_block(struct thread_data *td, struct fio_file *f,
return 1;
}
return 1;
}
-static int get_next_seq_
block
(struct thread_data *td, struct fio_file *f,
-
enum fio_ddir ddir, unsigned long long *b
)
+static int get_next_seq_
offset
(struct thread_data *td, struct fio_file *f,
+
enum fio_ddir ddir, unsigned long long *offset
)
{
assert(ddir_rw(ddir));
{
assert(ddir_rw(ddir));
- if (f->last_pos >= f->io_size && td->o.time_based)
+ if (f->last_pos >= f->io_size
+ get_start_offset(td)
&& td->o.time_based)
f->last_pos = f->last_pos - f->io_size;
if (f->last_pos < f->real_file_size) {
f->last_pos = f->last_pos - f->io_size;
if (f->last_pos < f->real_file_size) {
@@
-269,7
+269,7
@@
static int get_next_seq_block(struct thread_data *td, struct fio_file *f,
if (pos)
pos += td->o.ddir_seq_add;
if (pos)
pos += td->o.ddir_seq_add;
- *
b = pos / td->o.min_bs[ddir]
;
+ *
offset = pos
;
return 0;
}
return 0;
}
@@
-277,31
+277,33
@@
static int get_next_seq_block(struct thread_data *td, struct fio_file *f,
}
static int get_next_block(struct thread_data *td, struct io_u *io_u,
}
static int get_next_block(struct thread_data *td, struct io_u *io_u,
- enum fio_ddir ddir, int rw_seq
, unsigned long long *b
)
+ enum fio_ddir ddir, int rw_seq)
{
struct fio_file *f = io_u->file;
{
struct fio_file *f = io_u->file;
+ unsigned long long b, offset;
int ret;
assert(ddir_rw(ddir));
int ret;
assert(ddir_rw(ddir));
+ b = offset = -1ULL;
+
if (rw_seq) {
if (td_random(td))
if (rw_seq) {
if (td_random(td))
- ret = get_next_rand_block(td, f, ddir, b);
+ ret = get_next_rand_block(td, f, ddir,
&
b);
else
else
- ret = get_next_seq_
block(td, f, ddir, b
);
+ ret = get_next_seq_
offset(td, f, ddir, &offset
);
} else {
io_u->flags |= IO_U_F_BUSY_OK;
if (td->o.rw_seq == RW_SEQ_SEQ) {
} else {
io_u->flags |= IO_U_F_BUSY_OK;
if (td->o.rw_seq == RW_SEQ_SEQ) {
- ret = get_next_seq_
block(td, f, ddir, b
);
+ ret = get_next_seq_
offset(td, f, ddir, &offset
);
if (ret)
if (ret)
- ret = get_next_rand_block(td, f, ddir, b);
+ ret = get_next_rand_block(td, f, ddir,
&
b);
} else if (td->o.rw_seq == RW_SEQ_IDENT) {
if (f->last_start != -1ULL)
} else if (td->o.rw_seq == RW_SEQ_IDENT) {
if (f->last_start != -1ULL)
- *b = (f->last_start - f->file_offset)
- / td->o.min_bs[ddir];
+ offset = f->last_start - f->file_offset;
else
else
-
*b
= 0;
+
offset
= 0;
ret = 0;
} else {
log_err("fio: unknown rw_seq=%d\n", td->o.rw_seq);
ret = 0;
} else {
log_err("fio: unknown rw_seq=%d\n", td->o.rw_seq);
@@
-309,6
+311,17
@@
static int get_next_block(struct thread_data *td, struct io_u *io_u,
}
}
}
}
+ if (!ret) {
+ if (offset != -1ULL)
+ io_u->offset = offset;
+ else if (b != -1ULL)
+ io_u->offset = b * td->o.ba[ddir];
+ else {
+ log_err("fio: bug in offset generation\n");
+ ret = 1;
+ }
+ }
+
return ret;
}
return ret;
}
@@
-320,7
+333,6
@@
static int get_next_block(struct thread_data *td, struct io_u *io_u,
static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
{
struct fio_file *f = io_u->file;
static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
{
struct fio_file *f = io_u->file;
- unsigned long long b;
enum fio_ddir ddir = io_u->ddir;
int rw_seq_hit = 0;
enum fio_ddir ddir = io_u->ddir;
int rw_seq_hit = 0;
@@
-331,10
+343,9
@@
static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
td->ddir_seq_nr = td->o.ddir_seq_nr;
}
td->ddir_seq_nr = td->o.ddir_seq_nr;
}
- if (get_next_block(td, io_u, ddir, rw_seq_hit
, &b
))
+ if (get_next_block(td, io_u, ddir, rw_seq_hit))
return 1;
return 1;
- io_u->offset = b * td->o.ba[ddir];
if (io_u->offset >= f->io_size) {
dprint(FD_IO, "get_next_offset: offset %llu >= io_size %llu\n",
io_u->offset, f->io_size);
if (io_u->offset >= f->io_size) {
dprint(FD_IO, "get_next_offset: offset %llu >= io_size %llu\n",
io_u->offset, f->io_size);
@@
-366,7
+377,7
@@
static inline int io_u_fits(struct thread_data *td, struct io_u *io_u,
{
struct fio_file *f = io_u->file;
{
struct fio_file *f = io_u->file;
- return io_u->offset + buflen <= f->io_size +
td->o.start_offset
;
+ return io_u->offset + buflen <= f->io_size +
get_start_offset(td)
;
}
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
}
static unsigned int __get_next_buflen(struct thread_data *td, struct io_u *io_u)
@@
-532,6
+543,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;
return ddir;
}
return ddir;
}
@@
-588,8
+601,10
@@
static enum fio_ddir get_rw_ddir(struct thread_data *td)
ddir = td->rwmix_ddir;
} else if (td_read(td))
ddir = DDIR_READ;
ddir = td->rwmix_ddir;
} else if (td_read(td))
ddir = DDIR_READ;
- else
+ else
if (td_write(td))
ddir = DDIR_WRITE;
ddir = DDIR_WRITE;
+ else
+ ddir = DDIR_TRIM;
td->rwmix_ddir = rate_ddir(td, ddir);
return td->rwmix_ddir;
td->rwmix_ddir = rate_ddir(td, ddir);
return td->rwmix_ddir;
@@
-1370,7
+1385,9
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
td->io_blocks[idx]++;
td->this_io_blocks[idx]++;
td->io_bytes[idx] += bytes;
td->io_blocks[idx]++;
td->this_io_blocks[idx]++;
td->io_bytes[idx] += bytes;
- td->this_io_bytes[idx] += bytes;
+
+ if (!(io_u->flags & IO_U_F_VER_LIST))
+ td->this_io_bytes[idx] += bytes;
if (idx == DDIR_WRITE) {
f = io_u->file;
if (idx == DDIR_WRITE) {
f = io_u->file;
@@
-1393,7
+1410,7
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
(usec_for_io(td, idx) -
utime_since_now(&td->start));
}
(usec_for_io(td, idx) -
utime_since_now(&td->start));
}
- if (__should_check_rate(td, odx))
+ if (
idx != DDIR_TRIM &&
__should_check_rate(td, odx))
td->rate_pending_usleep[odx] =
(usec_for_io(td, odx) -
utime_since_now(&td->start));
td->rate_pending_usleep[odx] =
(usec_for_io(td, odx) -
utime_since_now(&td->start));
@@
-1431,13
+1448,15
@@
static void io_completed(struct thread_data *td, struct io_u *io_u,
static void init_icd(struct thread_data *td, struct io_completion_data *icd,
int nr)
{
static void init_icd(struct thread_data *td, struct io_completion_data *icd,
int nr)
{
+ int ddir;
if (!td->o.disable_clat || !td->o.disable_bw)
fio_gettime(&icd->time, NULL);
icd->nr = nr;
icd->error = 0;
if (!td->o.disable_clat || !td->o.disable_bw)
fio_gettime(&icd->time, NULL);
icd->nr = nr;
icd->error = 0;
- icd->bytes_done[0] = icd->bytes_done[1] = 0;
+ for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+ icd->bytes_done[ddir] = 0;
}
static void ios_completed(struct thread_data *td,
}
static void ios_completed(struct thread_data *td,
@@
-1476,8
+1495,10
@@
int io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
}
if (bytes) {
}
if (bytes) {
- bytes[0] += icd.bytes_done[0];
- bytes[1] += icd.bytes_done[1];
+ int ddir;
+
+ for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+ bytes[ddir] += icd.bytes_done[ddir];
}
return 0;
}
return 0;
@@
-1514,8
+1535,10
@@
int io_u_queued_complete(struct thread_data *td, int min_evts,
}
if (bytes) {
}
if (bytes) {
- bytes[0] += icd.bytes_done[0];
- bytes[1] += icd.bytes_done[1];
+ int ddir;
+
+ for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
+ bytes[ddir] += icd.bytes_done[ddir];
}
return 0;
}
return 0;