X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=cfb297886b7288e7ead21258a32c28af4055866e;hp=ee6ee51ec1553550322f0e8e9377b069127427ce;hb=ff2451922f21826c2047208c2c3963843b1ffdcc;hpb=0a0b49007cbce8d16c9214e7ed47a2b7cc0cc7ed diff --git a/stat.c b/stat.c index ee6ee51e..cfb29788 100644 --- a/stat.c +++ b/stat.c @@ -14,18 +14,18 @@ void update_rusage_stat(struct thread_data *td) { struct thread_stat *ts = &td->ts; - getrusage(RUSAGE_SELF, &ts->ru_end); - - ts->usr_time += mtime_since(&ts->ru_start.ru_utime, - &ts->ru_end.ru_utime); - ts->sys_time += mtime_since(&ts->ru_start.ru_stime, - &ts->ru_end.ru_stime); - ts->ctx += ts->ru_end.ru_nvcsw + ts->ru_end.ru_nivcsw - - (ts->ru_start.ru_nvcsw + ts->ru_start.ru_nivcsw); - ts->minf += ts->ru_end.ru_minflt - ts->ru_start.ru_minflt; - ts->majf += ts->ru_end.ru_majflt - ts->ru_start.ru_majflt; - - memcpy(&ts->ru_start, &ts->ru_end, sizeof(ts->ru_end)); + getrusage(RUSAGE_SELF, &td->ru_end); + + ts->usr_time += mtime_since(&td->ru_start.ru_utime, + &td->ru_end.ru_utime); + ts->sys_time += mtime_since(&td->ru_start.ru_stime, + &td->ru_end.ru_stime); + ts->ctx += td->ru_end.ru_nvcsw + td->ru_end.ru_nivcsw + - (td->ru_start.ru_nvcsw + td->ru_start.ru_nivcsw); + ts->minf += td->ru_end.ru_minflt - td->ru_start.ru_minflt; + ts->majf += td->ru_end.ru_majflt - td->ru_start.ru_majflt; + + memcpy(&td->ru_start, &td->ru_end, sizeof(td->ru_end)); } /* @@ -47,8 +47,10 @@ static unsigned int plat_val_to_idx(unsigned int val) else msb = (sizeof(val)*8) - __builtin_clz(val) - 1; - /* MSB <= (FIO_IO_U_PLAT_BITS-1), cannot be rounded off. Use - * all bits of the sample as index */ + /* + * MSB <= (FIO_IO_U_PLAT_BITS-1), cannot be rounded off. Use + * all bits of the sample as index + */ if (msb <= FIO_IO_U_PLAT_BITS) return val; @@ -58,8 +60,10 @@ static unsigned int plat_val_to_idx(unsigned int val) /* Compute the number of buckets before the group */ base = (error_bits + 1) << FIO_IO_U_PLAT_BITS; - /* Discard the error bits and apply the mask to find the - * index for the buckets in the group */ + /* + * Discard the error bits and apply the mask to find the + * index for the buckets in the group + */ offset = (FIO_IO_U_PLAT_VAL - 1) & (val >> error_bits); /* Make sure the index does not exceed (array size - 1) */ @@ -112,33 +116,41 @@ static int double_cmp(const void *a, const void *b) /* * Find and display the p-th percentile of clat */ -static void show_clat_percentiles(unsigned int* io_u_plat, unsigned long nr, - double* user_list) +static void show_clat_percentiles(unsigned int *io_u_plat, unsigned long nr, + double *user_list) { unsigned long sum = 0; unsigned int len, i, j = 0; + const double *plist; + int is_last = 0; static const double def_list[FIO_IO_U_LIST_MAX_LEN] = { 1.0, 5.0, 10.0, 20.0, 30.0, 40.0, 50.0, 60.0, 70.0, 80.0, 90.0, 95.0, 99.0, 99.5, 99.9}; - const double* plist = user_list? user_list: def_list; - for (len = 0; len 1) qsort((void*)user_list, len, sizeof(user_list[0]), double_cmp); - int is_last = 0; log_info(" clat percentiles (usec) :"); - for (i = 0; i = (plist[j]/100 * nr)) { + while (sum >= (plist[j] / 100 * nr)) { assert(plist[j] <= 100.0); - if (j!=0 && (j%4) == 0) /* for formatting */ + /* for formatting */ + if (j != 0 && (j % 4) == 0) log_info(" "); /* end of the list */ @@ -147,9 +159,10 @@ static void show_clat_percentiles(unsigned int* io_u_plat, unsigned long nr, log_info(" %2.2fth=%u%c", plist[j], plat_idx_to_val(i), (is_last? '\n' : ',')); - if (is_last) break; + if (is_last) + break; - if (j%4 == 3) /* for formatting */ + if (j % 4 == 3) /* for formatting */ log_info("\n"); j++; } @@ -178,13 +191,13 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max, return 1; } -static void show_group_stats(struct group_run_stats *rs, int id) +void show_group_stats(struct group_run_stats *rs) { char *p1, *p2, *p3, *p4; const char *ddir_str[] = { " READ", " WRITE" }; int i; - log_info("\nRun status group %d (all jobs):\n", id); + log_info("\nRun status group %d (all jobs):\n", rs->groupid); for (i = 0; i <= DDIR_WRITE; i++) { const int i2p = is_power_of_2(rs->kb_base); @@ -420,8 +433,7 @@ static void show_latencies(double *io_u_lat_u, double *io_u_lat_m) log_info("\n"); } -static void show_thread_status(struct thread_stat *ts, - struct group_run_stats *rs) +void show_thread_status(struct thread_stat *ts, struct group_run_stats *rs) { double usr_cpu, sys_cpu; unsigned long runtime; @@ -605,6 +617,9 @@ static void sum_stat(struct io_stat *dst, struct io_stat *src, int nr) { double mean, S; + if (src->samples == 0) + return; + dst->min_val = min(dst->min_val, src->min_val); dst->max_val = max(dst->max_val, src->max_val); @@ -711,8 +726,13 @@ void show_run_stats(void) /* * These are per-group shared already */ - ts->name = td->o.name; - ts->description = td->o.description; + strncpy(ts->name, td->o.name, FIO_JOBNAME_SIZE); + if (td->o.description) + strncpy(ts->description, td->o.description, + FIO_JOBNAME_SIZE); + else + memset(ts->description, 0, FIO_JOBNAME_SIZE); + ts->groupid = td->groupid; /* @@ -734,10 +754,10 @@ void show_run_stats(void) if (!td->error && td->o.continue_on_error && td->first_error) { ts->error = td->first_error; - ts->verror = td->verror; + strcpy(ts->verror, td->verror); } else if (td->error) { ts->error = td->error; - ts->verror = td->verror; + strcpy(ts->verror, td->verror); } } @@ -747,7 +767,6 @@ void show_run_stats(void) sum_stat(&ts->lat_stat[l], &td->ts.lat_stat[l], idx); sum_stat(&ts->bw_stat[l], &td->ts.bw_stat[l], idx); - ts->stat_io_bytes[l] += td->ts.stat_io_bytes[l]; ts->io_bytes[l] += td->ts.io_bytes[l]; if (ts->runtime[l] < td->ts.runtime[l]) @@ -773,11 +792,12 @@ void show_run_stats(void) for (k = 0; k <= 2; k++) { - int m; - ts->total_io_u[k] += td->ts.total_io_u[k]; ts->short_io_u[k] += td->ts.short_io_u[k]; + } + for (k = 0; k <= DDIR_WRITE; k++) { + int m; for (m = 0; m < FIO_IO_U_PLAT_NR; m++) ts->io_u_plat[k][m] += td->ts.io_u_plat[k][m]; } @@ -841,15 +861,24 @@ void show_run_stats(void) ts = &threadstats[i]; rs = &runstats[ts->groupid]; - if (terse_output) + if (is_backend) + fio_server_send_ts(ts, rs); + else if (terse_output) show_thread_status_terse(ts, rs); else show_thread_status(ts, rs); } if (!terse_output) { - for (i = 0; i < groupid + 1; i++) - show_group_stats(&runstats[i], i); + for (i = 0; i < groupid + 1; i++) { + rs = &runstats[i]; + + rs->groupid = i; + if (is_backend) + fio_server_send_gs(rs); + else + show_group_stats(rs); + } show_disk_util(); } @@ -937,8 +966,8 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir, add_stat_sample(&ts->clat_stat[ddir], usec); - if (ts->clat_log) - add_log_sample(td, ts->clat_log, usec, ddir, bs); + if (td->clat_log) + add_log_sample(td, td->clat_log, usec, ddir, bs); if (ts->clat_percentiles) add_clat_percentile_sample(ts, usec, ddir); @@ -954,8 +983,8 @@ void add_slat_sample(struct thread_data *td, enum fio_ddir ddir, add_stat_sample(&ts->slat_stat[ddir], usec); - if (ts->slat_log) - add_log_sample(td, ts->slat_log, usec, ddir, bs); + if (td->slat_log) + add_log_sample(td, td->slat_log, usec, ddir, bs); } void add_lat_sample(struct thread_data *td, enum fio_ddir ddir, @@ -968,8 +997,8 @@ void add_lat_sample(struct thread_data *td, enum fio_ddir ddir, add_stat_sample(&ts->lat_stat[ddir], usec); - if (ts->lat_log) - add_log_sample(td, ts->lat_log, usec, ddir, bs); + if (td->lat_log) + add_log_sample(td, td->lat_log, usec, ddir, bs); } void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs, @@ -981,17 +1010,17 @@ void add_bw_sample(struct thread_data *td, enum fio_ddir ddir, unsigned int bs, if (!ddir_rw(ddir)) return; - spent = mtime_since(&ts->stat_sample_time[ddir], t); + spent = mtime_since(&td->stat_sample_time[ddir], t); if (spent < td->o.bw_avg_time) return; - rate = (td->this_io_bytes[ddir] - ts->stat_io_bytes[ddir]) * + rate = (td->this_io_bytes[ddir] - td->stat_io_bytes[ddir]) * 1000 / spent / 1024; add_stat_sample(&ts->bw_stat[ddir], rate); - if (ts->bw_log) - add_log_sample(td, ts->bw_log, rate, ddir, bs); + if (td->bw_log) + add_log_sample(td, td->bw_log, rate, ddir, bs); - fio_gettime(&ts->stat_sample_time[ddir], NULL); - ts->stat_io_bytes[ddir] = td->this_io_bytes[ddir]; + fio_gettime(&td->stat_sample_time[ddir], NULL); + td->stat_io_bytes[ddir] = td->this_io_bytes[ddir]; }