#include "json.h"
#define FIO_DU_NAME_SZ 64
-extern volatile int helper_exit;
+#include "lib/output_buffer.h"
+#include "helper_thread.h"
struct disk_util_stats {
- uint32_t ios[2];
- uint32_t merges[2];
+ uint64_t ios[2];
+ uint64_t merges[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;
uint64_t msec;
};
};
struct disk_util_agg {
- uint32_t ios[2];
- uint32_t merges[2];
+ uint64_t ios[2];
+ uint64_t merges[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 pad;
fio_fp64_t max_util;
};
* 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 print_disk_util(struct disk_util_stat *, struct disk_util_agg *, int terse, struct buf_output *);
+extern void show_disk_util(int terse, struct json_object *parent, struct buf_output *);
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 disk_util_prune_entries(void);
#else
static inline void print_disk_util(struct disk_util_stat *du,
- struct disk_util_agg *agg, int terse)
+ struct disk_util_agg *agg, int terse,
+ struct buf_output *out)
{
}
-#define show_disk_util(terse, parent)
+#define show_disk_util(terse, parent, out)
#define disk_util_prune_entries()
#define init_disk_util(td)
#define setup_disk_util()
static inline int update_io_ticks(void)
{
- return helper_exit;
+ return helper_should_exit();
}
#endif
-static inline void disk_util_start_exit(void)
-{
- helper_exit = 1;
-}
#endif