#ifndef FIO_DISKUTIL_H
#define FIO_DISKUTIL_H
-
+#include "json.h"
#define FIO_DU_NAME_SZ 64
-/*
- * Disk utils as read in /sys/block/<dev>/stat
- */
-struct disk_util_stat {
- uint8_t name[FIO_DU_NAME_SZ];
+extern volatile int disk_util_exit;
+
+struct disk_util_stats {
uint32_t ios[2];
uint32_t merges[2];
uint64_t sectors[2];
uint64_t msec;
};
+/*
+ * Disk utils as read in /sys/block/<dev>/stat
+ */
+struct disk_util_stat {
+ uint8_t name[FIO_DU_NAME_SZ];
+ struct disk_util_stats s;
+};
+
struct disk_util_agg {
uint32_t ios[2];
uint32_t merges[2];
char *name;
char *sysfs_root;
- char path[256];
+ char path[PATH_MAX];
int major, minor;
struct disk_util_stat dus;
*/
#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 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)
-#define show_disk_util(terse)
-#define free_disk_util()
+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 0;
+ return disk_util_exit;
}
#endif
+static inline void disk_util_start_exit(void)
+{
+ disk_util_exit = 1;
+}
#endif