X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=libfio.c;h=198eaf2eb723f744cbc279cd3dff51a1be64bd00;hp=4b53c92a8756efbe945173d850acedd956608770;hb=HEAD;hpb=aa7d1aa6982189226ef19993dd4178979068be09 diff --git a/libfio.c b/libfio.c index 4b53c92a..d0c6bf8f 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 @@ -75,6 +74,8 @@ static const char *fio_arch_strings[arch_nr] = { "hppa", "mips", "aarch64", + "loongarch64", + "riscv64", "generic" }; @@ -88,23 +89,25 @@ static void reset_io_counters(struct thread_data *td, int all) 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->last_rate_check_bytes[ddir] = 0; + td->last_rate_check_blocks[ddir] = 0; 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->bytes_verified = 0; } td->zone_bytes = 0; - td->last_was_sync = 0; + td->last_was_sync = false; td->rwmix_issues = 0; /* * reset file done count if we are to start over */ - if (td->o.time_based || td->o.loops || td->o.do_verify) + if (td->o.time_based || td->loops > 1 || td->o.do_verify) td->nr_done_files = 0; } @@ -130,24 +133,29 @@ void clear_io_state(struct thread_data *td, int all) void reset_all_stats(struct thread_data *td) { + unsigned long long b; int i; reset_io_counters(td, 1); + b = ddir_rw_sum(td->thinktime_blocks_counter); + td->last_thinktime_blocks -= b; + 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; } - set_epoch_time(td, td->o.log_unix_epoch); - memcpy(&td->start, &td->epoch, sizeof(struct timeval)); - memcpy(&td->iops_sample_time, &td->epoch, sizeof(struct timeval)); - memcpy(&td->bw_sample_time, &td->epoch, sizeof(struct timeval)); - memcpy(&td->ss.prev_time, &td->epoch, sizeof(struct timeval)); + set_epoch_time(td, td->o.log_alternate_epoch_clock_id, td->o.job_start_clock_id); + 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)); + + td->last_thinktime = td->epoch; lat_target_reset(td); clear_rusage_stat(td); @@ -156,8 +164,13 @@ void reset_all_stats(struct thread_data *td) void reset_fio_state(void) { + int i; + groupid = 0; thread_number = 0; + cur_segment = 0; + for (i = 0; i < nr_segments; i++) + segments[i].nr_threads = 0; stat_number = 0; done_secs = 0; } @@ -230,19 +243,20 @@ 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) +void fio_terminate_threads(unsigned int group_id, unsigned int terminate) { - struct thread_data *td; pid_t pid = getpid(); - int i; dprint(FD_PROCESS, "terminate group_id=%d\n", group_id); - for_each_td(td, i) { - if (group_id == TERMINATE_ALL || group_id == td->groupid) { + for_each_td(td) { + if ((terminate == TERMINATE_GROUP && group_id == TERMINATE_ALL) || + (terminate == TERMINATE_GROUP && group_id == td->groupid) || + (terminate == TERMINATE_STONEWALL && td->runstate >= TD_RUNNING) || + (terminate == TERMINATE_ALL)) { dprint(FD_PROCESS, "setting terminate on %s/%d\n", td->o.name, (int) td->pid); @@ -266,22 +280,20 @@ void fio_terminate_threads(unsigned int group_id) ops->terminate(td); } } - } + } end_for_each(); } int fio_running_or_pending_io_threads(void) { - struct thread_data *td; - int i; int nr_io_threads = 0; - for_each_td(td, i) { - if (td->flags & TD_F_NOIO) + for_each_td(td) { + if (td->io_ops_init && td_ioengine_flagged(td, FIO_NOIO)) continue; nr_io_threads++; if (td->runstate < TD_EXITED) return 1; - } + } end_for_each(); if (!nr_io_threads) return -1; /* we only had cpuio threads to begin with */ @@ -353,14 +365,21 @@ int initialize_fio(char *envp[]) * 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((__TD_F_LAST + __FIO_IOENGINE_F_LAST) <= 8*sizeof(((struct thread_data *)0)->flags), "td->flags"); + compiletime_assert(BSSPLIT_MAX <= ZONESPLIT_MAX, "bsssplit/zone max"); err = endian_check(); if (err) {