projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept -foo as well as --foo for options
[fio.git]
/
io_u.c
diff --git
a/io_u.c
b/io_u.c
index 372f46a0507ddd941f47ff9d38a16a6d745569ae..6df4b5eee80190187aa0015b11aca7da73e714b4 100644
(file)
--- a/
io_u.c
+++ b/
io_u.c
@@
-37,10
+37,10
@@
static int random_map_free(struct thread_data *td, struct fio_file *f,
/*
* Mark a given offset as used in the map.
*/
/*
* Mark a given offset as used in the map.
*/
-static void mark_random_map(struct thread_data *td, struct fio_file *f,
- struct io_u *io_u)
+static void mark_random_map(struct thread_data *td, struct io_u *io_u)
{
unsigned int min_bs = td->rw_min_bs;
{
unsigned int min_bs = td->rw_min_bs;
+ struct fio_file *f = io_u->file;
unsigned long long block;
unsigned int blocks;
unsigned int nr_blocks;
unsigned long long block;
unsigned int blocks;
unsigned int nr_blocks;
@@
-98,9
+98,9
@@
static int get_next_free_block(struct thread_data *td, struct fio_file *f,
* until we find a free one. For sequential io, just return the end of
* the last io issued.
*/
* until we find a free one. For sequential io, just return the end of
* the last io issued.
*/
-static int get_next_offset(struct thread_data *td, struct fio_file *f,
- 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;
const int ddir = io_u->ddir;
unsigned long long b, rb;
long r;
const int ddir = io_u->ddir;
unsigned long long b, rb;
long r;
@@
-134,9
+134,9
@@
static int get_next_offset(struct thread_data *td, struct fio_file *f,
return 0;
}
return 0;
}
-static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
- struct io_u *io_u)
+static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
{
{
+ struct fio_file *f = io_u->file;
const int ddir = io_u->ddir;
unsigned int buflen;
long r;
const int ddir = io_u->ddir;
unsigned int buflen;
long r;
@@
-220,8
+220,7
@@
void requeue_io_u(struct thread_data *td, struct io_u **io_u)
*io_u = NULL;
}
*io_u = NULL;
}
-static int fill_io_u(struct thread_data *td, struct fio_file *f,
- struct io_u *io_u)
+static int fill_io_u(struct thread_data *td, struct io_u *io_u)
{
/*
* If using an iolog, grab next piece if any available.
{
/*
* If using an iolog, grab next piece if any available.
@@
-235,7
+234,6
@@
static int fill_io_u(struct thread_data *td, struct fio_file *f,
if (td->fsync_blocks && !(td->io_issues[DDIR_WRITE] % td->fsync_blocks)
&& td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
if (td->fsync_blocks && !(td->io_issues[DDIR_WRITE] % td->fsync_blocks)
&& td->io_issues[DDIR_WRITE] && should_fsync(td)) {
io_u->ddir = DDIR_SYNC;
- io_u->file = f;
return 0;
}
return 0;
}
@@
-245,10
+243,10
@@
static int fill_io_u(struct thread_data *td, struct fio_file *f,
* No log, let the seq/rand engine retrieve the next buflen and
* position.
*/
* No log, let the seq/rand engine retrieve the next buflen and
* position.
*/
- if (get_next_offset(td,
f,
io_u))
+ if (get_next_offset(td, io_u))
return 1;
return 1;
- io_u->buflen = get_next_buflen(td,
f,
io_u);
+ io_u->buflen = get_next_buflen(td, io_u);
if (!io_u->buflen)
return 1;
if (!io_u->buflen)
return 1;
@@
-256,7
+254,7
@@
static int fill_io_u(struct thread_data *td, struct fio_file *f,
* mark entry before potentially trimming io_u
*/
if (!td->read_iolog && td_random(td) && !td->norandommap)
* mark entry before potentially trimming io_u
*/
if (!td->read_iolog && td_random(td) && !td->norandommap)
- mark_random_map(td,
f,
io_u);
+ mark_random_map(td, io_u);
/*
* If using a write iolog, store this entry.
/*
* If using a write iolog, store this entry.
@@
-264,7
+262,6
@@
static int fill_io_u(struct thread_data *td, struct fio_file *f,
if (td->write_iolog_file)
write_iolog_put(td, io_u);
if (td->write_iolog_file)
write_iolog_put(td, io_u);
- io_u->file = f;
return 0;
}
return 0;
}
@@
-332,11
+329,12
@@
static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
*/
static struct fio_file *get_next_file_rand(struct thread_data *td)
{
*/
static struct fio_file *get_next_file_rand(struct thread_data *td)
{
- long r = os_random_long(&td->next_file_state);
unsigned int fileno;
struct fio_file *f;
do {
unsigned int fileno;
struct fio_file *f;
do {
+ long r = os_random_long(&td->next_file_state);
+
fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
f = &td->files[fileno];
if (f->fd != -1)
fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
f = &td->files[fileno];
if (f->fd != -1)
@@
-368,6
+366,17
@@
static struct fio_file *get_next_file_rr(struct thread_data *td)
return f;
}
return f;
}
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+ if (!td->nr_open_files)
+ return NULL;
+
+ if (td->file_service_type == FIO_FSERVICE_RR)
+ return get_next_file_rr(td);
+ else
+ return get_next_file_rand(td);
+}
+
struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u = NULL;
struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u = NULL;
@@
-416,28
+425,30
@@
struct io_u *get_io_u(struct thread_data *td)
if (io_u->file)
goto out;
if (io_u->file)
goto out;
- if (td->file_service_type == FIO_FSERVICE_RR)
- f = get_next_file_rr(td);
- else
- f = get_next_file_rand(td);
+ do {
+ f = get_next_file(td);
+ if (!f) {
+ put_io_u(td, io_u);
+ return NULL;
+ }
- if (!f) {
- put_io_u(td, io_u);
- return NULL;
- }
+ io_u->file = f;
- io_u->file = f;
+ if (!fill_io_u(td, io_u))
+ break;
+
+ /*
+ * No more to do for this file, close it
+ */
+ io_u->file = NULL;
+ close_file(td, f);
+ } while (1);
if (td->zone_bytes >= td->zone_size) {
td->zone_bytes = 0;
f->last_pos += td->zone_skip;
}
if (td->zone_bytes >= td->zone_size) {
td->zone_bytes = 0;
f->last_pos += td->zone_skip;
}
- if (fill_io_u(td, f, io_u)) {
- put_io_u(td, io_u);
- return NULL;
- }
-
if (io_u->buflen + io_u->offset > f->real_file_size) {
if (td->io_ops->flags & FIO_RAWIO) {
put_io_u(td, io_u);
if (io_u->buflen + io_u->offset > f->real_file_size) {
if (td->io_ops->flags & FIO_RAWIO) {
put_io_u(td, io_u);
@@
-572,13
+583,7
@@
long io_u_queued_complete(struct thread_data *td, int min_events)
struct timespec *tvp = NULL;
int ret;
struct timespec *tvp = NULL;
int ret;
- if (min_events > 0) {
- ret = td_io_commit(td);
- if (ret < 0) {
- td_verror(td, -ret, "td_io_commit");
- return ret;
- }
- } else {
+ if (!min_events) {
struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
tvp = &ts;
struct timespec ts = { .tv_sec = 0, .tv_nsec = 0, };
tvp = &ts;