#ifndef FIO_DISKUTIL_H
#define FIO_DISKUTIL_H
-#include "json.h"
#define FIO_DU_NAME_SZ 64
-extern volatile int helper_exit;
+#include "helper_thread.h"
+#include "fio_sem.h"
struct disk_util_stats {
uint64_t ios[2];
*/
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)
* 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 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 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()
-#define json_array_add_disk_util(dus, agg, parent)
static inline int update_io_ticks(void)
{
- return helper_exit;
+ return helper_should_exit();
}
#endif