options: add support for checking if an option has been set

[fio.git] / diskutil.h

diff --git a/diskutil.h b/diskutil.h
index 5a9b079661023487642179b84dfad0b8b3d330e0..c0ae0ed057660ab23fc4f142e17bc725b5124c7e 100644 (file)
--- a/diskutil.h
+++ b/diskutil.h
@@ -1,30 +1,37 @@
 #ifndef FIO_DISKUTIL_H
 #define FIO_DISKUTIL_H
 #ifndef FIO_DISKUTIL_H
 #define FIO_DISKUTIL_H

-
+#include "json.h"

 #define FIO_DU_NAME_SZ         64
 
 #define FIO_DU_NAME_SZ         64
 

+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];
 /*
  * 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 {
 };
 
 struct disk_util_agg {

-       uint32_t ios[2];
-       uint32_t merges[2];
+       uint64_t ios[2];
+       uint64_t merges[2];

        uint64_t sectors[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 slavecount;

+       uint32_t pad;

        fio_fp64_t max_util;
 };
 
        fio_fp64_t max_util;
 };
 


@@ -40,7 +47,7 @@ struct disk_util {
 
        char *name;
        char *sysfs_root;
 
        char *name;
        char *sysfs_root;

-       char path[256];
+       char path[PATH_MAX];

        int major, minor;
 
        struct disk_util_stat dus;
        int major, minor;
 
        struct disk_util_stat dus;


@@ -99,16 +106,28 @@ extern struct flist_head disk_list;
  */
 #ifdef FIO_HAVE_DISK_UTIL
 extern void print_disk_util(struct disk_util_stat *, struct disk_util_agg *, int terse);
  */
 #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 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
 #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 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 helper_exit;
+}

 #endif
 
 #endif
 #endif
 
 #endif