X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=libfio.c;h=8eddab80b345651f11533038963bb03e5bc0ff93;hp=37e5c0db5a6e32fd67b6bd1f24addf4d73066f88;hb=96ed30cee2c29a61a7c45ab56335ff23d70e377d;hpb=90b7a96d9573a14f20470af2aa0dd4e60611a477 diff --git a/libfio.c b/libfio.c index 37e5c0db..8eddab80 100644 --- a/libfio.c +++ b/libfio.c @@ -41,8 +41,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 +52,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] = { @@ -83,7 +85,6 @@ 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->zone_bytes = 0; @@ -127,11 +128,14 @@ void reset_all_stats(struct thread_data *td) 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); memcpy(&td->epoch, &tv, sizeof(tv)); memcpy(&td->start, &tv, sizeof(tv)); + + lat_target_reset(td); } void reset_fio_state(void) @@ -168,6 +172,19 @@ 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_terminate_threads(int group_id) { struct thread_data *td; @@ -240,6 +257,10 @@ int initialize_fio(char *envp[]) return 1; } +#if !defined(CONFIG_GETTIMEOFDAY) && !defined(CONFIG_CLOCK_GETTIME) +#error "No available clock source!" +#endif + arch_init(envp); sinit();