projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
options: show closest match for unknown job option
[fio.git]
/
diskutil.h
diff --git
a/diskutil.h
b/diskutil.h
index 7207c731c9d4d2a6158be0577c0873556f388a5e..c0ae0ed057660ab23fc4f142e17bc725b5124c7e 100644
(file)
--- a/
diskutil.h
+++ b/
diskutil.h
@@
-3,30
+3,35
@@
#include "json.h"
#define FIO_DU_NAME_SZ 64
#include "json.h"
#define FIO_DU_NAME_SZ 64
-extern volatile int disk_util_exit;
+extern volatile int helper_exit;
+
+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;
};
@@
-96,8
+101,6
@@
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
*/
/*
* disk util stuff
*/
@@
-123,12
+126,8
@@
static inline void print_disk_util(struct disk_util_stat *du,
static inline int update_io_ticks(void)
{
static inline int update_io_ticks(void)
{
- return
disk_util
_exit;
+ return
helper
_exit;
}
#endif
}
#endif
-static inline void disk_util_start_exit(void)
-{
- disk_util_exit = 1;
-}
#endif
#endif