Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RFC] Non-repeating file_service_type: roundrobin1 and random1 #1809

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[RFC] Non-repeating file_service_type: roundrobin1 and random1 #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ enum fio_file_flags {
FIO_FILE_axmap = 1 << 7, /* uses axmap */
FIO_FILE_lfsr = 1 << 8, /* lfsr is used */
FIO_FILE_smalloc = 1 << 9, /* smalloc file/file_name */
FIO_FILE_busy = 1 << 10, /* out of service */
};

enum file_lock_mode {
Expand All @@ -53,6 +54,9 @@ enum {
FIO_FSERVICE_RR = 2,
FIO_FSERVICE_SEQ = 3,
__FIO_FSERVICE_NONUNIFORM = 0x100,
__FIO_FSERVICE_NONREPEAT = 0x200,
FIO_FSERVICE_RANDOM1 = __FIO_FSERVICE_NONREPEAT | FIO_FSERVICE_RANDOM,
FIO_FSERVICE_RR1 = __FIO_FSERVICE_NONREPEAT | FIO_FSERVICE_RR,
FIO_FSERVICE_ZIPF = __FIO_FSERVICE_NONUNIFORM | 4,
FIO_FSERVICE_PARETO = __FIO_FSERVICE_NONUNIFORM | 5,
FIO_FSERVICE_GAUSS = __FIO_FSERVICE_NONUNIFORM | 6,
Expand Down Expand Up @@ -196,6 +200,7 @@ FILE_FLAG_FNS(partial_mmap);
FILE_FLAG_FNS(axmap);
FILE_FLAG_FNS(lfsr);
FILE_FLAG_FNS(smalloc);
FILE_FLAG_FNS(busy);
#undef FILE_FLAG_FNS

/*
Expand Down
1 change: 1 addition & 0 deletions fio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ struct thread_data {
unsigned int files_index;
unsigned int nr_open_files;
unsigned int nr_done_files;
unsigned int nr_busy_files;
union {
unsigned int next_file;
struct frand_state next_file_state;
Expand Down
3 changes: 2 additions & 1 deletion init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,8 @@ void td_fill_rand_seeds(struct thread_data *td)
use64);
init_rand_seed(&td->rwmix_state, td->rand_seeds[FIO_RAND_MIX_OFF], false);

if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
if (td->o.file_service_type == FIO_FSERVICE_RANDOM ||
td->o.file_service_type == FIO_FSERVICE_RANDOM1)
init_rand_seed(&td->next_file_state, td->rand_seeds[FIO_RAND_FILE_OFF], use64);
else if (td->o.file_service_type & __FIO_FSERVICE_NONUNIFORM)
init_rand_file_service(td);
Expand Down
23 changes: 20 additions & 3 deletions io_u.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,11 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
if (needs_lock)
__td_io_u_lock(td);

if (io_u->file && (td->o.file_service_type & __FIO_FSERVICE_NONREPEAT)) {
fio_file_clear_busy(io_u->file);
td->nr_busy_files--;
}

if (io_u->file && !(io_u->flags & IO_U_F_NO_FILE_PUT))
put_file_log(td, io_u->file);

Expand Down Expand Up @@ -1308,7 +1313,8 @@ static unsigned int __get_next_fileno_rand(struct thread_data *td)
{
unsigned long fileno;

if (td->o.file_service_type == FIO_FSERVICE_RANDOM) {
if (td->o.file_service_type == FIO_FSERVICE_RANDOM ||
td->o.file_service_type == FIO_FSERVICE_RANDOM1) {
uint64_t frand_max = rand_max(&td->next_file_state);
unsigned long r;

Expand Down Expand Up @@ -1348,8 +1354,11 @@ static struct fio_file *get_next_file_rand(struct thread_data *td,
fno = __get_next_fileno_rand(td);

f = td->files[fno];
if (fio_file_done(f))
if (fio_file_done(f) || fio_file_busy(f)) {
if (td->nr_busy_files >= td->nr_open_files)
return ERR_PTR(-EBUSY);
continue;
}

if (!fio_file_open(f)) {
int err;
Expand Down Expand Up @@ -1391,7 +1400,9 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
td->next_file = 0;

dprint(FD_FILE, "trying file %s %x\n", f->file_name, f->flags);
if (fio_file_done(f)) {
if (fio_file_done(f) || fio_file_busy(f)) {
if (td->nr_busy_files >= td->nr_open_files)
return ERR_PTR(-EBUSY);
f = NULL;
continue;
}
Expand Down Expand Up @@ -1452,6 +1463,7 @@ static struct fio_file *__get_next_file(struct thread_data *td)
}

if (td->o.file_service_type == FIO_FSERVICE_RR ||
td->o.file_service_type == FIO_FSERVICE_RR1 ||
td->o.file_service_type == FIO_FSERVICE_SEQ)
f = get_next_file_rr(td, FIO_FILE_open, FIO_FILE_closing);
else
Expand All @@ -1462,6 +1474,11 @@ static struct fio_file *__get_next_file(struct thread_data *td)

td->file_service_file = f;
td->file_service_left = td->file_service_nr - 1;

if (f && (td->o.file_service_type & __FIO_FSERVICE_NONREPEAT)) {
fio_file_set_busy(f);
td->nr_busy_files++;
}
out:
if (f)
dprint(FD_FILE, "get_next_file: %p [%s]\n", f, f->file_name);
Expand Down
10 changes: 10 additions & 0 deletions options.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,8 @@ static int str_fst_cb(void *data, const char *str)
case FIO_FSERVICE_RANDOM:
case FIO_FSERVICE_RR:
case FIO_FSERVICE_SEQ:
case FIO_FSERVICE_RANDOM1:
case FIO_FSERVICE_RR1:
nr = get_opt_postfix(str);
if (nr) {
td->file_service_nr = atoi(nr);
Expand Down Expand Up @@ -2766,6 +2768,14 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
.oval = FIO_FSERVICE_SEQ,
.help = "Finish one file before moving to the next",
},
{ .ival = "random1",
.oval = FIO_FSERVICE_RANDOM1,
.help = "Choose a file at random (uniform) non-repeating",
},
{ .ival = "roundrobin1",
.oval = FIO_FSERVICE_RR1,
.help = "Round robin non-repeating",
},
},
.parent = "nrfiles",
.hide = 1,
Expand Down