Add json output for client/server mode

[fio.git] / diskutil.h

diff --git a/diskutil.h b/diskutil.h
index dc89cc51ac5261d81afaa3f8383cacb3e68ff123..7207c731c9d4d2a6158be0577c0873556f388a5e 100644 (file)
--- a/diskutil.h
+++ b/diskutil.h
@@ -1,16 +1,33 @@
 #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/<dev>/stat
  */
 struct disk_util_stat {
-       unsigned ios[2];
-       unsigned merges[2];
-       unsigned long long sectors[2];
-       unsigned ticks[2];
-       unsigned io_ticks;
-       unsigned time_in_queue;
+       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_agg {
+       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;
+       uint32_t slavecount;
+       fio_fp64_t max_util;
 };
 
 /*
@@ -25,12 +42,14 @@ struct disk_util {
 
        char *name;
        char *sysfs_root;
-       char path[256];
+       char path[PATH_MAX];
        int major, minor;
 
        struct disk_util_stat dus;
        struct disk_util_stat last_dus;
 
+       struct disk_util_agg agg;
+
        /* For software raids, this entry maintains pointers to the
         * entries for the slave devices. The disk_util entries for
         * the slaves devices should primarily be maintained through
@@ -40,7 +59,6 @@ struct disk_util {
         */
        struct flist_head slaves;
 
-       unsigned long msec;
        struct timeval time;
 
        struct fio_mutex *lock;
@@ -76,17 +94,41 @@ static inline void disk_util_dec(struct disk_util *du)
 
 #define DISK_UTIL_MSEC (250)
 
+extern struct flist_head disk_list;
+
+extern void wait_for_disk_thread_exit(void);
+
 /*
  * disk util stuff
  */
 #ifdef FIO_HAVE_DISK_UTIL
-extern void show_disk_util(void);
+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 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 show_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 update_io_ticks()
+#define setup_disk_util()
+#define json_array_add_disk_util(dus, agg, parent)
+
+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