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]++;
}
/*
do {
long r = os_random_long(&td->next_file_state);
- fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+ 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) &&
+ !(f->flags & FIO_FILE_CLOSING))
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) &&
+ !(f->flags & FIO_FILE_CLOSING))
break;
f = NULL;
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)
- return get_next_file_rr(td);
+ f = get_next_file_rr(td);
else
- return get_next_file_rand(td);
+ 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)
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;
* No more to do for this file, close it
*/
io_u->file = NULL;
- close_file(td, f);
+ 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) {
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)
{
assert(io_u->flags & IO_U_F_FLIGHT);
io_u->flags &= ~IO_U_F_FLIGHT;
+ put_file(td, io_u->file);
+
if (io_u->ddir == DDIR_SYNC) {
td->last_was_sync = 1;
return;
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, int nr)