fix load_ioengine() not to support no "external:" prefix

[fio.git] / diskutil.h

diff --git a/diskutil.h b/diskutil.h
index 25d0bebfc4074ec83074f8e3e423a89315df2851..91b42020a8077024607a3818c9314e7882189390 100644 (file)
--- a/diskutil.h
+++ b/diskutil.h
@@ -4,8 +4,7 @@
 #define FIO_DU_NAME_SZ         64
 
 #include "lib/output_buffer.h"
-
-extern volatile int helper_exit;
+#include "helper_thread.h"
 
 struct disk_util_stats {
        uint64_t ios[2];
@@ -47,7 +46,6 @@ struct disk_util {
         */
        struct flist_head slavelist;
 
-       char *name;
        char *sysfs_root;
        char path[PATH_MAX];
        int major, minor;
@@ -66,7 +64,7 @@ struct disk_util {
         */
        struct flist_head slaves;
 
-       struct timeval time;
+       struct timespec time;
 
        struct fio_mutex *lock;
        unsigned long users;
@@ -116,6 +114,7 @@ extern int update_io_ticks(void);
 extern void setup_disk_util(void);
 extern void disk_util_prune_entries(void);
 #else
+/* keep this as a function to avoid a warning in handle_du() */
 static inline void print_disk_util(struct disk_util_stat *du,
                                   struct disk_util_agg *agg, int terse,
                                   struct buf_output *out)
@@ -129,7 +128,7 @@ static inline void print_disk_util(struct disk_util_stat *du,
 
 static inline int update_io_ticks(void)
 {
-       return helper_exit;
+       return helper_should_exit();
 }
 #endif