struct io_completion_data {
int nr; /* input */
- endio_handler *handler; /* input */
int error; /* output */
unsigned long bytes_done[2]; /* output */
/*
* 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;
+ struct fio_file *f = io_u->file;
unsigned long long block;
unsigned int blocks;
unsigned int nr_blocks;
* 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;
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;
{
struct io_u *__io_u = *io_u;
+ __io_u->flags |= IO_U_F_FREE;
+ __io_u->flags &= ~IO_U_F_FLIGHT;
+
list_del(&__io_u->list);
list_add_tail(&__io_u->list, &td->io_u_requeues);
td->cur_depth--;
*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 (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;
}
* 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;
- 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;
* 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 (td->write_iolog_file)
write_iolog_put(td, io_u);
- io_u->file = f;
return 0;
}
-static void io_u_mark_depth(struct thread_data *td)
+void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
{
int index = 0;
+ if (io_u->ddir == DDIR_SYNC)
+ return;
+
switch (td->cur_depth) {
default:
index++;
break;
}
- td->io_u_map[index]++;
- td->total_io_u++;
+ td->ts.io_u_map[index]++;
+ td->ts.total_io_u[io_u->ddir]++;
}
static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
break;
}
- td->io_u_lat[index]++;
+ td->ts.io_u_lat[index]++;
}
/*
*/
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 {
- fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+ long r = os_random_long(&td->next_file_state);
+
+ fileno = (unsigned int) ((double) (td->open_files * r) / (RAND_MAX + 1.0));
f = &td->files[fileno];
- if (f->fd != -1)
+ if (f->flags & FIO_FILE_OPEN)
return f;
} while (1);
}
f = &td->files[td->next_file];
td->next_file++;
- if (td->next_file >= td->nr_files)
+ if (td->next_file >= td->open_files)
td->next_file = 0;
- if (f->fd != -1)
+ if (f->flags & FIO_FILE_OPEN)
break;
f = NULL;
return f;
}
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+ struct fio_file *f;
+
+ if (!td->nr_open_files)
+ return NULL;
+
+ f = td->file_service_file;
+ if (f && (f->flags & FIO_FILE_OPEN) && td->file_service_left--)
+ return f;
+
+ if (td->file_service_type == FIO_FSERVICE_RR)
+ f = get_next_file_rr(td);
+ else
+ f = get_next_file_rand(td);
+
+ td->file_service_file = f;
+ td->file_service_left = td->file_service_nr - 1;
+ return f;
+}
+
struct io_u *__get_io_u(struct thread_data *td)
{
struct io_u *io_u = NULL;
io_u->buflen = 0;
io_u->resid = 0;
io_u->file = NULL;
+ io_u->end_io = NULL;
}
if (io_u) {
list_del(&io_u->list);
list_add(&io_u->list, &td->io_u_busylist);
td->cur_depth++;
- io_u_mark_depth(td);
}
return io_u;
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;
+
+ if (!fill_io_u(td, io_u))
+ break;
- io_u->file = f;
+ /*
+ * No more to do for this file, close it
+ */
+ io_u->file = NULL;
+ td_io_close_file(td, f);
+
+ /*
+ * probably not the right place to do this, but see
+ * if we need to open a new file
+ */
+ if (td->nr_open_files < td->nr_files &&
+ td->open_files != td->nr_files) {
+ int ret = td_io_open_file(td, f);
+
+ if (ret) {
+ put_io_u(td, io_u);
+ return NULL;
+ }
+ }
+ } while (1);
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);
return io_u;
}
+void io_u_log_error(struct thread_data *td, struct io_u *io_u)
+{
+ const char *msg[] = { "read", "write", "sync" };
+
+ log_err("fio: io_u error");
+
+ if (io_u->file)
+ log_err(" on file %s", io_u->file->file_name);
+
+ log_err(": %s\n", strerror(io_u->error));
+
+ log_err(" %s offset=%llu, buflen=%lu\n", msg[io_u->ddir], io_u->offset, io_u->xfer_buflen);
+
+ if (!td->error)
+ td_verror(td, io_u->error, "io_u error");
+}
+
static void io_completed(struct thread_data *td, struct io_u *io_u,
struct io_completion_data *icd)
{
icd->bytes_done[idx] += bytes;
- if (icd->handler) {
- ret = icd->handler(io_u);
+ if (io_u->end_io) {
+ ret = io_u->end_io(io_u);
if (ret && !icd->error)
icd->error = ret;
}
- } else
+ } else {
icd->error = io_u->error;
+ io_u_log_error(td, io_u);
+ }
}
-static void init_icd(struct io_completion_data *icd, endio_handler *handler,
- int nr)
+static void init_icd(struct io_completion_data *icd, int nr)
{
fio_gettime(&icd->time, NULL);
- icd->handler = handler;
icd->nr = nr;
icd->error = 0;
/*
* Complete a single io_u for the sync engines.
*/
-long io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
- endio_handler *handler)
+long io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
{
struct io_completion_data icd;
- init_icd(&icd, handler, 1);
+ init_icd(&icd, 1);
io_completed(td, io_u, &icd);
put_io_u(td, io_u);
if (!icd.error)
return icd.bytes_done[0] + icd.bytes_done[1];
+ td_verror(td, icd.error, "io_u_sync_complete");
return -1;
}
/*
* Called to complete min_events number of io for the async engines.
*/
-long io_u_queued_complete(struct thread_data *td, int min_events,
- endio_handler *handler)
-
+long io_u_queued_complete(struct thread_data *td, int min_events)
{
struct io_completion_data icd;
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;
} else if (!ret)
return ret;
- init_icd(&icd, handler, ret);
+ init_icd(&icd, ret);
ios_completed(td, &icd);
if (!icd.error)
return icd.bytes_done[0] + icd.bytes_done[1];
+ td_verror(td, icd.error, "io_u_queued_complete");
return -1;
}
projects / fio.git / blobdiff