Consolidate disk util, eta, and status check thread

[fio.git] / stat.h

diff --git a/stat.h b/stat.h
index fb1485dfb46eb86ec8335e6fb8a4c986cd340ce4..32ea22694e75e173db8df7252e10288150c577f1 100644 (file)
--- a/stat.h
+++ b/stat.h
@@ -12,7 +12,7 @@ struct group_run_stats {
        uint32_t unit_base;
        uint32_t groupid;
        uint32_t unified_rw_rep;
-};
+} __attribute__((packed));
 
 /*
  * How many depth levels to log
@@ -160,6 +160,7 @@ struct thread_stat {
        uint32_t io_u_plat[DDIR_RWDIR_CNT][FIO_IO_U_PLAT_NR];
        uint64_t total_io_u[3];
        uint64_t short_io_u[3];
+       uint64_t drop_io_u[3];
        uint64_t total_submit;
        uint64_t total_complete;
 
@@ -179,9 +180,10 @@ struct thread_stat {
 
        uint32_t latency_depth;
        uint64_t latency_target;
+       uint16_t pad;
        fio_fp64_t latency_percentile;
        uint64_t latency_window;
-};
+} __attribute__((packed));
 
 struct jobs_eta {
        uint32_t nr_running;
@@ -191,7 +193,6 @@ struct jobs_eta {
        uint32_t nr_setting_up;
 
        uint32_t files_open;
-       uint32_t pad1;
 
        uint32_t m_rate[DDIR_RWDIR_CNT], t_rate[DDIR_RWDIR_CNT];
        uint32_t m_iops[DDIR_RWDIR_CNT], t_iops[DDIR_RWDIR_CNT];
@@ -206,9 +207,8 @@ struct jobs_eta {
         * Network 'copy' of run_str[]
         */
        uint32_t nr_threads;
-       uint32_t pad2;
        uint8_t run_str[];
-};
+} __attribute__((packed));
 
 extern struct jobs_eta *get_jobs_eta(int force, size_t *size);
 
@@ -220,6 +220,8 @@ extern void show_group_stats(struct group_run_stats *rs);
 extern int 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);
 extern void check_for_running_stats(void);
 extern void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr);