X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=libfio.c;h=b823bd4779bfed19b1ae0c544a52eb79f17ebcd6;hp=36876ddf24dc66c25f9b778fc4141acb122e433f;hb=ec803e97e616d8a410d760368c478b683625842a;hpb=80666bece308842c36132245e4cbbe9eb0bc506b diff --git a/libfio.c b/libfio.c index 36876ddf..b823bd47 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 @@ -41,8 +43,8 @@ FLIST_HEAD(disk_list); unsigned long arch_flags = 0; -uintptr_t page_mask; -uintptr_t page_size; +uintptr_t page_mask = 0; +uintptr_t page_size = 0; static const char *fio_os_strings[os_nr] = { "Invalid", @@ -52,8 +54,10 @@ static const char *fio_os_strings[os_nr] = { "HP-UX", "OSX", "NetBSD", + "OpenBSD", "Solaris", - "Windows" + "Windows", + "Android", }; static const char *fio_arch_strings[arch_nr] = { @@ -74,20 +78,25 @@ static const char *fio_arch_strings[arch_nr] = { static void reset_io_counters(struct thread_data *td) { - td->stat_io_bytes[0] = td->stat_io_bytes[1] = 0; - td->this_io_bytes[0] = td->this_io_bytes[1] = 0; - td->stat_io_blocks[0] = td->stat_io_blocks[1] = 0; - td->this_io_blocks[0] = td->this_io_blocks[1] = 0; + int ddir; + + for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) { + td->stat_io_bytes[ddir] = 0; + td->this_io_bytes[ddir] = 0; + td->stat_io_blocks[ddir] = 0; + td->this_io_blocks[ddir] = 0; + td->rate_bytes[ddir] = 0; + td->rate_blocks[ddir] = 0; + } td->zone_bytes = 0; - td->rate_bytes[0] = td->rate_bytes[1] = 0; - td->rate_blocks[0] = td->rate_blocks[1] = 0; td->last_was_sync = 0; + td->rwmix_issues = 0; /* * reset file done count if we are to start over */ - if (td->o.time_based || td->o.loops) + if (td->o.time_based || td->o.loops || td->o.do_verify) td->nr_done_files = 0; } @@ -99,8 +108,10 @@ 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 @@ -115,24 +126,27 @@ void reset_all_stats(struct thread_data *td) reset_io_counters(td); - for (i = 0; i < 2; i++) { + for (i = 0; i < DDIR_RWDIR_CNT; i++) { td->io_bytes[i] = 0; td->io_blocks[i] = 0; td->io_issues[i] = 0; td->ts.total_io_u[i] = 0; + td->ts.runtime[i] = 0; + td->rwmix_issues = 0; } fio_gettime(&tv, NULL); - td->ts.runtime[0] = 0; - td->ts.runtime[1] = 0; memcpy(&td->epoch, &tv, sizeof(tv)); memcpy(&td->start, &tv, sizeof(tv)); + + lat_target_reset(td); } void reset_fio_state(void) { groupid = 0; thread_number = 0; + stat_number = 0; done_secs = 0; } @@ -162,9 +176,30 @@ void td_set_runstate(struct thread_data *td, int 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; + pid_t pid = getpid(); int i; dprint(FD_PROCESS, "terminate group_id=%d\n", group_id); @@ -173,26 +208,63 @@ 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; /* * if the thread is running, just let it exit */ - if (!td->pid) + if (!td->pid || pid == td->pid) continue; else if (td->runstate < TD_RAMP) kill(td->pid, SIGTERM); else { struct ioengine_ops *ops = td->io_ops; - if (ops && (ops->flags & FIO_SIGTERM)) - kill(td->pid, SIGTERM); + if (ops && ops->terminate) + ops->terminate(td); } } } } +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 { @@ -207,10 +279,10 @@ static int endian_check(void) else if (u.c[0] == 0x12) le = 1; -#if defined(FIO_LITTLE_ENDIAN) +#if defined(CONFIG_LITTLE_ENDIAN) if (be) return 1; -#elif defined(FIO_BIG_ENDIAN) +#elif defined(CONFIG_BIG_ENDIAN) if (le) return 1; #else @@ -227,16 +299,37 @@ 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, 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"); return 1; } +#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME) +#error "No available clock source!" +#endif + arch_init(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.