#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/<dev>/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;
};
char *name;
char *sysfs_root;
- char path[256];
+ char path[PATH_MAX];
int major, minor;
struct disk_util_stat dus;
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, struct json_object *parent);
+extern void json_array_add_disk_util(struct disk_util_stat *dus,
+ struct disk_util_agg *agg, struct json_array *parent);
extern void init_disk_util(struct thread_data *);
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)
+static inline void print_disk_util(struct disk_util_stat *du,
+ struct disk_util_agg *agg, int terse)
+{
+}
#define show_disk_util(terse, parent)
#define disk_util_prune_entries()
#define init_disk_util(td)
#define setup_disk_util()
+#define json_array_add_disk_util(dus, agg, parent)
+
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