projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fio 2.2.8
[fio.git]
/
diskutil.h
diff --git
a/diskutil.h
b/diskutil.h
index f621113e4b1a43c7bd80f1a872651dde794b5ffc..c0ae0ed057660ab23fc4f142e17bc725b5124c7e 100644
(file)
--- a/
diskutil.h
+++ b/
diskutil.h
@@
-3,15
+3,15
@@
#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 {
struct disk_util_stats {
- 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;
uint64_t msec;
};
uint64_t msec;
};
@@
-24,13
+24,14
@@
struct disk_util_stat {
};
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;
};
@@
-125,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