#ifndef FIO_DISKUTIL_H
#define FIO_DISKUTIL_H
-#include "json.h"
#define FIO_DU_NAME_SZ 64
-extern volatile int disk_util_exit;
+#include <limits.h>
+
+#include "helper_thread.h"
+#include "fio_sem.h"
+
+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];
- 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 {
- 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;
};
*/
struct flist_head slavelist;
- char *name;
char *sysfs_root;
char path[PATH_MAX];
int major, minor;
*/
struct flist_head slaves;
- struct timeval time;
+ struct timespec time;
- struct fio_mutex *lock;
+ struct fio_sem *lock;
unsigned long users;
};
if (du) {
struct flist_head *n;
- fio_mutex_down(du->lock);
+ fio_sem_down(du->lock);
du->users += val;
flist_for_each(n, &du->slavelist) {
slave = flist_entry(n, struct disk_util, slavelist);
slave->users += val;
}
- fio_mutex_up(du->lock);
+ fio_sem_up(du->lock);
}
}
static inline void disk_util_inc(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 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
-static inline void print_disk_util(struct disk_util_stat *du,
- struct disk_util_agg *agg, int terse)
-{
-}
-#define show_disk_util(terse, parent)
+/* keep this as a function to avoid a warning in handle_du() */
#define disk_util_prune_entries()
#define init_disk_util(td)
#define setup_disk_util()
+
static inline int update_io_ticks(void)
{
- return disk_util_exit;
+ return helper_should_exit();
}
#endif
-static inline void disk_util_start_exit(void)
-{
- disk_util_exit = 1;
-}
-
#endif