projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix exit being slowed by disk util stat time
[fio.git]
/
diskutil.h
diff --git
a/diskutil.h
b/diskutil.h
index 7207c731c9d4d2a6158be0577c0873556f388a5e..f621113e4b1a43c7bd80f1a872651dde794b5ffc 100644
(file)
--- a/
diskutil.h
+++ b/
diskutil.h
@@
-5,11
+5,7
@@
extern volatile int disk_util_exit;
extern volatile int disk_util_exit;
-/*
- * Disk utils as read in /sys/block/<dev>/stat
- */
-struct disk_util_stat {
- uint8_t name[FIO_DU_NAME_SZ];
+struct disk_util_stats {
uint32_t ios[2];
uint32_t merges[2];
uint64_t sectors[2];
uint32_t ios[2];
uint32_t merges[2];
uint64_t sectors[2];
@@
-19,6
+15,14
@@
struct disk_util_stat {
uint64_t msec;
};
uint64_t msec;
};
+/*
+ * Disk utils as read in /sys/block/<dev>/stat
+ */
+struct disk_util_stat {
+ uint8_t name[FIO_DU_NAME_SZ];
+ struct disk_util_stats s;
+};
+
struct disk_util_agg {
uint32_t ios[2];
uint32_t merges[2];
struct disk_util_agg {
uint32_t ios[2];
uint32_t merges[2];
@@
-96,8
+100,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
*/