X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.h;h=c0ae0ed057660ab23fc4f142e17bc725b5124c7e;hp=7207c731c9d4d2a6158be0577c0873556f388a5e;hb=50a8ce864e2c5bee7c44935b39b357aa8071615b;hpb=952b05e00103bf45576e1860cde0626bd42ed52a diff --git a/diskutil.h b/diskutil.h index 7207c731..c0ae0ed0 100644 --- a/diskutil.h +++ b/diskutil.h @@ -3,30 +3,35 @@ #include "json.h" #define FIO_DU_NAME_SZ 64 -extern volatile int disk_util_exit; +extern volatile int helper_exit; + +struct disk_util_stats { + uint64_t ios[2]; + uint64_t merges[2]; + uint64_t sectors[2]; + uint64_t ticks[2]; + uint64_t io_ticks; + uint64_t time_in_queue; + uint64_t msec; +}; /* * Disk utils as read in /sys/block//stat */ struct disk_util_stat { uint8_t name[FIO_DU_NAME_SZ]; - uint32_t ios[2]; - uint32_t merges[2]; - uint64_t sectors[2]; - uint32_t ticks[2]; - uint32_t io_ticks; - uint32_t time_in_queue; - uint64_t msec; + struct disk_util_stats s; }; struct disk_util_agg { - uint32_t ios[2]; - uint32_t merges[2]; + uint64_t ios[2]; + uint64_t merges[2]; uint64_t sectors[2]; - uint32_t ticks[2]; - uint32_t io_ticks; - uint32_t time_in_queue; + uint64_t ticks[2]; + uint64_t io_ticks; + uint64_t time_in_queue; uint32_t slavecount; + uint32_t pad; fio_fp64_t max_util; }; @@ -96,8 +101,6 @@ static inline void disk_util_dec(struct disk_util *du) extern struct flist_head disk_list; -extern void wait_for_disk_thread_exit(void); - /* * disk util stuff */ @@ -123,12 +126,8 @@ static inline void print_disk_util(struct disk_util_stat *du, static inline int update_io_ticks(void) { - return disk_util_exit; + return helper_exit; } #endif -static inline void disk_util_start_exit(void) -{ - disk_util_exit = 1; -} #endif