X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=libfio.c;h=b0141a7524e2c3d5c18d7f8e14c1503710c73363;hp=c26d6a3aaa0964b6bb2b5fecda1fd93355d578d2;hb=6e760cf3906d0942715c3c0de43040c53c0b8a92;hpb=8f91cc3f7835cdca84944d456e1da77d44a7c354 diff --git a/libfio.c b/libfio.c index c26d6a3a..b0141a75 100644 --- a/libfio.c +++ b/libfio.c @@ -27,10 +27,12 @@ #include #include #include +#include #include "fio.h" #include "smalloc.h" #include "os/os.h" +#include "filelock.h" /* * Just expose an empty list, if the OS does not support disk util stats @@ -52,8 +54,11 @@ static const char *fio_os_strings[os_nr] = { "HP-UX", "OSX", "NetBSD", + "OpenBSD", "Solaris", - "Windows" + "Windows", + "Android", + "DragonFly", }; static const char *fio_arch_strings[arch_nr] = { @@ -83,7 +88,7 @@ static void reset_io_counters(struct thread_data *td) td->this_io_blocks[ddir] = 0; td->rate_bytes[ddir] = 0; td->rate_blocks[ddir] = 0; - td->io_issues[ddir] = 0; + td->bytes_done[ddir] = 0; } td->zone_bytes = 0; @@ -105,13 +110,16 @@ void clear_io_state(struct thread_data *td) reset_io_counters(td); close_files(td); - for_each_file(td, f, i) + for_each_file(td, f, i) { fio_file_clear_done(f); + f->file_offset = get_start_offset(td, f); + } /* - * Set the same seed to get repeatable runs + * Re-Seed random number generator if rand_repeatable is true */ - td_fill_rand_seeds(td); + if (td->o.rand_repeatable) + td_fill_rand_seeds(td); } void reset_all_stats(struct thread_data *td) @@ -133,6 +141,8 @@ void reset_all_stats(struct thread_data *td) fio_gettime(&tv, NULL); memcpy(&td->epoch, &tv, sizeof(tv)); memcpy(&td->start, &tv, sizeof(tv)); + + lat_target_reset(td); } void reset_fio_state(void) @@ -159,16 +169,61 @@ const char *fio_get_arch_string(int nr) return NULL; } +static const char *td_runstates[] = { + "NOT_CREATED", + "CREATED", + "INITIALIZED", + "RAMP", + "SETTING_UP", + "RUNNING", + "PRE_READING", + "VERIFYING", + "FSYNCING", + "FINISHING", + "EXITED", + "REAPED", +}; + +static const char *runstate_to_name(int runstate) +{ + compiletime_assert(TD_LAST == 12, "td runstate list"); + if (runstate >= 0 && runstate < TD_LAST) + return td_runstates[runstate]; + + return "invalid"; +} + void td_set_runstate(struct thread_data *td, int runstate) { if (td->runstate == runstate) return; - dprint(FD_PROCESS, "pid=%d: runstate %d -> %d\n", (int) td->pid, - td->runstate, runstate); + dprint(FD_PROCESS, "pid=%d: runstate %s -> %s\n", (int) td->pid, + runstate_to_name(td->runstate), + runstate_to_name(runstate)); td->runstate = runstate; } +int td_bump_runstate(struct thread_data *td, int new_state) +{ + int old_state = td->runstate; + + td_set_runstate(td, new_state); + return old_state; +} + +void td_restore_runstate(struct thread_data *td, int old_state) +{ + td_set_runstate(td, old_state); +} + +void fio_mark_td_terminate(struct thread_data *td) +{ + fio_gettime(&td->terminate_time, NULL); + write_barrier(); + td->terminate = 1; +} + void fio_terminate_threads(int group_id) { struct thread_data *td; @@ -181,7 +236,11 @@ void fio_terminate_threads(int group_id) if (group_id == TERMINATE_ALL || groupid == td->groupid) { dprint(FD_PROCESS, "setting terminate on %s/%d\n", td->o.name, (int) td->pid); - td->terminate = 1; + + if (td->terminate) + continue; + + fio_mark_td_terminate(td); td->o.start_delay = 0; /* @@ -201,6 +260,39 @@ void fio_terminate_threads(int group_id) } } +int fio_running_or_pending_io_threads(void) +{ + struct thread_data *td; + int i; + + for_each_td(td, i) { + if (td->flags & TD_F_NOIO) + continue; + if (td->runstate < TD_EXITED) + return 1; + } + + return 0; +} + +int fio_set_fd_nonblocking(int fd, const char *who) +{ + int flags; + + flags = fcntl(fd, F_GETFL); + if (flags < 0) + log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno)); + else { + int new_flags = flags | O_NONBLOCK; + + new_flags = fcntl(fd, F_SETFL, new_flags); + if (new_flags < 0) + log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno)); + } + + return flags; +} + static int endian_check(void) { union { @@ -235,6 +327,20 @@ int initialize_fio(char *envp[]) { long ps; + /* + * We need these to be properly 64-bit aligned, otherwise we + * can run into problems on archs that fault on unaligned fp + * access (ARM). + */ + compiletime_assert((offsetof(struct thread_stat, percentile_list) % 8) == 0, "stat percentile_list"); + compiletime_assert((offsetof(struct thread_stat, total_run_time) % 8) == 0, "total_run_time"); + compiletime_assert((offsetof(struct thread_stat, total_err_count) % 8) == 0, "total_err_count"); + compiletime_assert((offsetof(struct thread_stat, latency_percentile) % 8) == 0, "stat latency_percentile"); + compiletime_assert((offsetof(struct thread_options_pack, zipf_theta) % 8) == 0, "zipf_theta"); + compiletime_assert((offsetof(struct thread_options_pack, pareto_h) % 8) == 0, "pareto_h"); + compiletime_assert((offsetof(struct thread_options_pack, percentile_list) % 8) == 0, "percentile_list"); + compiletime_assert((offsetof(struct thread_options_pack, latency_percentile) % 8) == 0, "latency_percentile"); + if (endian_check()) { log_err("fio: endianness settings appear wrong.\n"); log_err("fio: please report this to fio@vger.kernel.org\n"); @@ -249,6 +355,11 @@ int initialize_fio(char *envp[]) sinit(); + if (fio_filelock_init()) { + log_err("fio: failed initializing filelock subsys\n"); + return 1; + } + /* * We need locale for number printing, if it isn't set then just * go with the US format. @@ -268,3 +379,8 @@ int initialize_fio(char *envp[]) fio_keywords_init(); return 0; } + +void deinitialize_fio(void) +{ + fio_keywords_exit(); +}