X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.h;h=b89aaccbf8020db0e8008f8e09d8b53858c8f6c1;hp=5a9b079661023487642179b84dfad0b8b3d330e0;hb=372aecb9049618c1279a946b66f6b29066730951;hpb=99614958d743d0fdea9b1875d3a41a5a51e9769d diff --git a/diskutil.h b/diskutil.h index 5a9b0796..b89aaccb 100644 --- a/diskutil.h +++ b/diskutil.h @@ -1,8 +1,10 @@ #ifndef FIO_DISKUTIL_H #define FIO_DISKUTIL_H - +#include "json.h" #define FIO_DU_NAME_SZ 64 +extern volatile int disk_util_exit; + /* * Disk utils as read in /sys/block//stat */ @@ -94,21 +96,33 @@ 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 */ #ifdef FIO_HAVE_DISK_UTIL extern void print_disk_util(struct disk_util_stat *, struct disk_util_agg *, int terse); -extern void show_disk_util(int terse); -extern void free_disk_util(void); +extern void show_disk_util(int terse, struct json_object *parent); extern void init_disk_util(struct thread_data *); -extern void update_io_ticks(void); +extern int update_io_ticks(void); +extern void setup_disk_util(void); +extern void disk_util_prune_entries(void); #else #define print_disk_util(dus, agg, terse) -#define show_disk_util(terse) -#define free_disk_util() +#define show_disk_util(terse, parent) +#define disk_util_prune_entries() #define init_disk_util(td) -#define update_io_ticks() +#define setup_disk_util() +static inline int update_io_ticks(void) +{ + return disk_util_exit; +} #endif +static inline void disk_util_start_exit(void) +{ + disk_util_exit = 1; +} + #endif