X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=libfio.c;h=674bc1dc0a9ed37216bf86ae25acef05e33dd4f4;hp=25866758be9fac27001fdf9715e47f36fa6779dd;hb=ad4e92984ec2d92b18abede6cfbf8ef7f353d77a;hpb=a691d82fcc4e841568bf78d9b992aaee2a88b728 diff --git a/libfio.c b/libfio.c index 25866758..674bc1dc 100644 --- a/libfio.c +++ b/libfio.c @@ -18,12 +18,11 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ #include -#include #include #include #include @@ -34,19 +33,16 @@ #include "os/os.h" #include "filelock.h" #include "helper_thread.h" +#include "filehash.h" -/* - * Just expose an empty list, if the OS does not support disk util stats - */ -#ifndef FIO_HAVE_DISK_UTIL FLIST_HEAD(disk_list); -#endif unsigned long arch_flags = 0; uintptr_t page_mask = 0; uintptr_t page_size = 0; +/* see os/os.h */ static const char *fio_os_strings[os_nr] = { "Invalid", "Linux", @@ -62,6 +58,7 @@ static const char *fio_os_strings[os_nr] = { "DragonFly", }; +/* see arch/arch.h */ static const char *fio_arch_strings[arch_nr] = { "Invalid", "x86-64", @@ -75,6 +72,8 @@ static const char *fio_arch_strings[arch_nr] = { "arm", "sh", "hppa", + "mips", + "aarch64", "generic" }; @@ -93,12 +92,13 @@ static void reset_io_counters(struct thread_data *td, int all) td->bytes_done[ddir] = 0; td->rate_io_issue_bytes[ddir] = 0; td->rate_next_io_time[ddir] = 0; + td->last_usec[ddir] = 0; } } td->zone_bytes = 0; - td->last_was_sync = 0; + td->last_was_sync = false; td->rwmix_issues = 0; /* @@ -130,7 +130,6 @@ void clear_io_state(struct thread_data *td, int all) void reset_all_stats(struct thread_data *td) { - struct timeval tv; int i; reset_io_counters(td, 1); @@ -144,11 +143,11 @@ void reset_all_stats(struct thread_data *td) td->rwmix_issues = 0; } - fio_gettime(&tv, NULL); - memcpy(&td->epoch, &tv, sizeof(tv)); - memcpy(&td->start, &tv, sizeof(tv)); - memcpy(&td->iops_sample_time, &tv, sizeof(tv)); - memcpy(&td->bw_sample_time, &tv, sizeof(tv)); + set_epoch_time(td, td->o.log_unix_epoch); + memcpy(&td->start, &td->epoch, sizeof(td->epoch)); + memcpy(&td->iops_sample_time, &td->epoch, sizeof(td->epoch)); + memcpy(&td->bw_sample_time, &td->epoch, sizeof(td->epoch)); + memcpy(&td->ss.prev_time, &td->epoch, sizeof(td->epoch)); lat_target_reset(td); clear_rusage_stat(td); @@ -231,7 +230,7 @@ void fio_mark_td_terminate(struct thread_data *td) { fio_gettime(&td->terminate_time, NULL); write_barrier(); - td->terminate = 1; + td->terminate = true; } void fio_terminate_threads(unsigned int group_id) @@ -277,7 +276,7 @@ int fio_running_or_pending_io_threads(void) int nr_io_threads = 0; for_each_td(td, i) { - if (td->flags & TD_F_NOIO) + if (td->io_ops_init && td_ioengine_flagged(td, FIO_NOIO)) continue; nr_io_threads++; if (td->runstate < TD_EXITED) @@ -307,6 +306,13 @@ int fio_set_fd_nonblocking(int fd, const char *who) return flags; } +enum { + ENDIAN_INVALID_BE = 1, + ENDIAN_INVALID_LE, + ENDIAN_INVALID_CONFIG, + ENDIAN_BROKEN, +}; + static int endian_check(void) { union { @@ -323,16 +329,16 @@ static int endian_check(void) #if defined(CONFIG_LITTLE_ENDIAN) if (be) - return 1; + return ENDIAN_INVALID_BE; #elif defined(CONFIG_BIG_ENDIAN) if (le) - return 1; + return ENDIAN_INVALID_LE; #else - return 1; + return ENDIAN_INVALID_CONFIG; #endif if (!le && !be) - return 1; + return ENDIAN_BROKEN; return 0; } @@ -340,23 +346,48 @@ static int endian_check(void) int initialize_fio(char *envp[]) { long ps; + int err; /* * 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_data, ts) % sizeof(void *)) == 0, "ts"); 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_data, ts.clat_stat) % 8) == 0, "ts.clat_stat"); 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"); + compiletime_assert((offsetof(struct jobs_eta, m_rate) % 8) == 0, "m_rate"); + + compiletime_assert(__TD_F_LAST <= TD_ENG_FLAG_SHIFT, "TD_ENG_FLAG_SHIFT"); + compiletime_assert(BSSPLIT_MAX <= ZONESPLIT_MAX, "bsssplit/zone max"); - if (endian_check()) { + err = endian_check(); + if (err) { log_err("fio: endianness settings appear wrong.\n"); + switch (err) { + case ENDIAN_INVALID_BE: + log_err("fio: got big-endian when configured for little\n"); + break; + case ENDIAN_INVALID_LE: + log_err("fio: got little-endian when configured for big\n"); + break; + case ENDIAN_INVALID_CONFIG: + log_err("fio: not configured to any endianness\n"); + break; + case ENDIAN_BROKEN: + log_err("fio: failed to detect endianness\n"); + break; + default: + assert(0); + break; + } log_err("fio: please report this to fio@vger.kernel.org\n"); return 1; } @@ -374,6 +405,8 @@ int initialize_fio(char *envp[]) return 1; } + file_hash_init(); + /* * We need locale for number printing, if it isn't set then just * go with the US format.