do {
r = os_random_long(&td->random_state);
- b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
+ if (!max_blocks)
+ b = 0;
+ else
+ b = ((max_blocks - 1) * r / (unsigned long long) (RAND_MAX+1.0));
if (td->norandommap)
break;
rb = b + (f->file_offset / td->min_bs[ddir]);
}
while (buflen + io_u->offset > f->real_file_size) {
- if (buflen == td->min_bs[ddir])
+ if (buflen == td->min_bs[ddir]) {
+ if (!td->odirect) {
+ assert(io_u->offset <= f->real_file_size);
+ buflen = f->real_file_size - io_u->offset;
+ return buflen;
+ }
return 0;
+ }
buflen = td->min_bs[ddir];
}
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++;
}
td->ts.io_u_map[index]++;
- td->ts.total_io_u++;
+ td->ts.total_io_u[io_u->ddir]++;
}
static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
/*
* Get next file to service by choosing one at random
*/
-static struct fio_file *get_next_file_rand(struct thread_data *td)
+static struct fio_file *get_next_file_rand(struct thread_data *td, int goodf,
+ int badf)
{
- unsigned int fileno;
struct fio_file *f;
+ int fno;
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)
+ fno = (unsigned int) ((double) td->nr_files * (r / (RAND_MAX + 1.0)));
+ f = &td->files[fno];
+
+ if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
return f;
} while (1);
}
/*
* Get next file to service by doing round robin between all available ones
*/
-static struct fio_file *get_next_file_rr(struct thread_data *td)
+static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
+ int badf)
{
unsigned int old_next_file = td->next_file;
struct fio_file *f;
if (td->next_file >= td->nr_files)
td->next_file = 0;
- if (f->fd != -1)
+ if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
break;
f = NULL;
static struct fio_file *get_next_file(struct thread_data *td)
{
+ struct fio_file *f;
+
+ assert(td->nr_files <= td->files_index);
+
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, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+ else
+ f = get_next_file_rand(td, FIO_FILE_OPEN, FIO_FILE_CLOSING);
+
+ td->file_service_file = f;
+ td->file_service_left = td->file_service_nr - 1;
+ return f;
+}
+
+static struct fio_file *find_next_new_file(struct thread_data *td)
+{
+ struct fio_file *f;
+
if (td->file_service_type == FIO_FSERVICE_RR)
- return get_next_file_rr(td);
+ f = get_next_file_rr(td, 0, FIO_FILE_OPEN);
else
- return get_next_file_rand(td);
+ f = get_next_file_rand(td, 0, FIO_FILE_OPEN);
+
+ 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;
{
struct fio_file *f;
struct io_u *io_u;
+ int ret;
io_u = __get_io_u(td);
if (!io_u)
return NULL;
}
+set_file:
io_u->file = f;
if (!fill_io_u(td, 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->open_files &&
+ td->open_files != td->nr_files) {
+ f = find_next_new_file(td);
+
+ if (!f || (ret = td_io_open_file(td, f))) {
+ put_io_u(td, io_u);
+ return NULL;
+ }
+ goto set_file;
+ }
} while (1);
if (td->zone_bytes >= td->zone_size) {
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;