projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wip-rbd-engine-tweaks' of https://github.com/dillaman/fio
[fio.git]
/
diskutil.h
diff --git
a/diskutil.h
b/diskutil.h
index 6ae4aeed2e78522edb037ccc976e4ceda26b7941..83bcbf895e799f989645d86cbc23f0dbdf698f39 100644
(file)
--- a/
diskutil.h
+++ b/
diskutil.h
@@
-1,32
+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 disk_util_exit;
+#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];
/*
* 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 {
- uint
32
_t ios[2];
- uint
32
_t merges[2];
+ uint
64
_t ios[2];
+ uint
64
_t merges[2];
uint64_t sectors[2];
uint64_t sectors[2];
- uint
32
_t ticks[2];
- uint
32
_t io_ticks;
- uint
32
_t time_in_queue;
+ uint
64
_t ticks[2];
+ uint
64
_t io_ticks;
+ uint
64
_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
+45,6
@@
struct disk_util {
*/
struct flist_head slavelist;
*/
struct flist_head slavelist;
- char *name;
char *sysfs_root;
char path[PATH_MAX];
int major, minor;
char *sysfs_root;
char path[PATH_MAX];
int major, minor;
@@
-59,9
+63,9
@@
struct disk_util {
*/
struct flist_head slaves;
*/
struct flist_head slaves;
- struct time
val
time;
+ struct time
spec
time;
- struct fio_
mutex
*lock;
+ struct fio_
sem
*lock;
unsigned long users;
};
unsigned long users;
};
@@
-70,7
+74,7
@@
static inline void disk_util_mod(struct disk_util *du, int val)
if (du) {
struct flist_head *n;
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) {
du->users += val;
flist_for_each(n, &du->slavelist) {
@@
-79,7
+83,7
@@
static inline void disk_util_mod(struct disk_util *du, int val)
slave = flist_entry(n, struct disk_util, slavelist);
slave->users += val;
}
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)
}
}
static inline void disk_util_inc(struct disk_util *du)
@@
-96,36
+100,24
@@
static inline void disk_util_dec(struct disk_util *du)
extern struct flist_head disk_list;
extern struct flist_head disk_list;
-extern void wait_for_disk_thread_exit(void);
-
/*
* disk util stuff
*/
#ifdef FIO_HAVE_DISK_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 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
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 disk_util_prune_entries()
#define init_disk_util(td)
#define setup_disk_util()
+
static inline int update_io_ticks(void)
{
static inline int update_io_ticks(void)
{
- return
disk_util_exit
;
+ return
helper_should_exit()
;
}
#endif
}
#endif
-static inline void disk_util_start_exit(void)
-{
- disk_util_exit = 1;
-}
-
#endif
#endif