x86: don't need 'level' passed to amd/intel init functions

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index fd5131f9cc80a3d91492941829ca641e1e500b0e..c5b818543cf9fd70fc6ec920fea9873d83583e80 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -159,10 +159,10 @@ struct thread_stat {
        /*
         * bandwidth and latency stats
         */
+       struct io_stat sync_stat __attribute__((aligned(8)));/* fsync etc stats */
        struct io_stat clat_stat[DDIR_RWDIR_CNT]; /* completion latency */
        struct io_stat slat_stat[DDIR_RWDIR_CNT]; /* submission latency */
        struct io_stat lat_stat[DDIR_RWDIR_CNT]; /* total latency */
-       struct io_stat sync_stat;               /* fsync etc stats */
        struct io_stat bw_stat[DDIR_RWDIR_CNT]; /* bandwidth stats */
        struct io_stat iops_stat[DDIR_RWDIR_CNT]; /* IOPS stats */
 
@@ -182,15 +182,14 @@ struct thread_stat {
        uint64_t percentile_precision;
        fio_fp64_t percentile_list[FIO_IO_U_LIST_MAX_LEN];
 
-       uint32_t io_u_map[FIO_IO_U_MAP_NR];
-       uint32_t io_u_submit[FIO_IO_U_MAP_NR];
-       uint32_t io_u_complete[FIO_IO_U_MAP_NR];
-       uint32_t io_u_lat_n[FIO_IO_U_LAT_N_NR];
-       uint32_t io_u_lat_u[FIO_IO_U_LAT_U_NR];
-       uint32_t io_u_lat_m[FIO_IO_U_LAT_M_NR];
-       uint32_t io_u_plat[DDIR_RWDIR_CNT][FIO_IO_U_PLAT_NR];
-       uint32_t io_u_sync_plat[FIO_IO_U_PLAT_NR];
-       uint32_t pad;
+       uint64_t io_u_map[FIO_IO_U_MAP_NR];
+       uint64_t io_u_submit[FIO_IO_U_MAP_NR];
+       uint64_t io_u_complete[FIO_IO_U_MAP_NR];
+       uint64_t io_u_lat_n[FIO_IO_U_LAT_N_NR];
+       uint64_t io_u_lat_u[FIO_IO_U_LAT_U_NR];
+       uint64_t io_u_lat_m[FIO_IO_U_LAT_M_NR];
+       uint64_t io_u_plat[DDIR_RWDIR_CNT][FIO_IO_U_PLAT_NR];
+       uint64_t io_u_sync_plat[FIO_IO_U_PLAT_NR];
 
        uint64_t total_io_u[DDIR_RWDIR_SYNC_CNT];
        uint64_t short_io_u[DDIR_RWDIR_CNT];
@@ -275,10 +274,10 @@ struct jobs_eta {
 
 struct io_u_plat_entry {
        struct flist_head list;
-       unsigned int io_u_plat[FIO_IO_U_PLAT_NR];
+       uint64_t io_u_plat[FIO_IO_U_PLAT_NR];
 };
 
-extern struct fio_mutex *stat_mutex;
+extern struct fio_sem *stat_sem;
 
 extern struct jobs_eta *get_jobs_eta(bool force, size_t *size);
 
@@ -289,7 +288,6 @@ extern struct json_object * show_thread_status(struct thread_stat *ts, struct gr
 extern void show_group_stats(struct group_run_stats *rs, struct buf_output *);
 extern bool calc_thread_status(struct jobs_eta *je, int force);
 extern void display_thread_status(struct jobs_eta *je);
-extern void show_run_stats(void);
 extern void __show_run_stats(void);
 extern void __show_running_run_stats(void);
 extern void show_running_run_stats(void);
@@ -300,11 +298,11 @@ extern void init_thread_stat(struct thread_stat *ts);
 extern void init_group_run_stat(struct group_run_stats *gs);
 extern void eta_to_str(char *str, unsigned long eta_sec);
 extern bool calc_lat(struct io_stat *is, unsigned long long *min, unsigned long long *max, double *mean, double *dev);
-extern unsigned int calc_clat_percentiles(unsigned int *io_u_plat, unsigned long long nr, fio_fp64_t *plist, unsigned long long **output, unsigned long long *maxv, unsigned long long *minv);
+extern unsigned int calc_clat_percentiles(uint64_t *io_u_plat, unsigned long long nr, fio_fp64_t *plist, unsigned long long **output, unsigned long long *maxv, unsigned long long *minv);
 extern void stat_calc_lat_n(struct thread_stat *ts, double *io_u_lat);
 extern void stat_calc_lat_m(struct thread_stat *ts, double *io_u_lat);
 extern void stat_calc_lat_u(struct thread_stat *ts, double *io_u_lat);
-extern void stat_calc_dist(unsigned int *map, unsigned long total, double *io_u_dist);
+extern void stat_calc_dist(uint64_t *map, unsigned long total, double *io_u_dist);
 extern void reset_io_stats(struct thread_data *);
 extern void update_rusage_stat(struct thread_data *);
 extern void clear_rusage_stat(struct thread_data *);