X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.h;h=8623fd723b723053c59337984208c5c7f3f57a8e;hp=b89aaccbf8020db0e8008f8e09d8b53858c8f6c1;hb=99b9a85a2962b4792f92d167fc66744a9ebb1128;hpb=73cfb8a7da365c37253662477edb54ecc19575df

diff --git a/diskutil.h b/diskutil.h
index b89aaccb..8623fd72 100644
--- a/diskutil.h
+++ b/diskutil.h
@@ -3,13 +3,9 @@
 #include "json.h"
 #define FIO_DU_NAME_SZ		64
 
-extern volatile int disk_util_exit;
+extern volatile int helper_exit;
 
-/*
- * Disk utils as read in /sys/block/<dev>/stat
- */
-struct disk_util_stat {
-	uint8_t name[FIO_DU_NAME_SZ];
+struct disk_util_stats {
 	uint32_t ios[2];
 	uint32_t merges[2];
 	uint64_t sectors[2];
@@ -19,6 +15,14 @@ struct disk_util_stat {
 	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];
@@ -42,7 +46,7 @@ struct disk_util {
 
 	char *name;
 	char *sysfs_root;
-	char path[256];
+	char path[PATH_MAX];
 	int major, minor;
 
 	struct disk_util_stat dus;
@@ -96,33 +100,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, 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