projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add check for invariant TSC on x86 and use TSC is default clock if reliable
[fio.git]
/
diskutil.h
diff --git
a/diskutil.h
b/diskutil.h
index 35fd0a5953b97c130f331c4691d9d4e6067450f5..b89aaccbf8020db0e8008f8e09d8b53858c8f6c1 100644
(file)
--- a/
diskutil.h
+++ b/
diskutil.h
@@
-1,16
+1,33
@@
#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
+
+extern volatile int disk_util_exit;
/*
* Disk utils as read in /sys/block/<dev>/stat
*/
struct disk_util_stat {
/*
* Disk utils as read in /sys/block/<dev>/stat
*/
struct disk_util_stat {
- unsigned ios[2];
- unsigned merges[2];
- unsigned long long sectors[2];
- unsigned ticks[2];
- unsigned io_ticks;
- unsigned time_in_queue;
+ 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_agg {
+ 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;
+ uint32_t slavecount;
+ fio_fp64_t max_util;
};
/*
};
/*
@@
-31,6
+48,8
@@
struct disk_util {
struct disk_util_stat dus;
struct disk_util_stat last_dus;
struct disk_util_stat dus;
struct disk_util_stat last_dus;
+ struct disk_util_agg agg;
+
/* For software raids, this entry maintains pointers to the
* entries for the slave devices. The disk_util entries for
* the slaves devices should primarily be maintained through
/* For software raids, this entry maintains pointers to the
* entries for the slave devices. The disk_util entries for
* the slaves devices should primarily be maintained through
@@
-40,44
+59,70
@@
struct disk_util {
*/
struct flist_head slaves;
*/
struct flist_head slaves;
- unsigned long msec;
struct timeval time;
struct fio_mutex *lock;
unsigned long users;
};
struct timeval time;
struct fio_mutex *lock;
unsigned long users;
};
-static inline void disk_util_
inc(struct disk_util *du
)
+static inline void disk_util_
mod(struct disk_util *du, int val
)
{
if (du) {
{
if (du) {
+ struct flist_head *n;
+
fio_mutex_down(du->lock);
fio_mutex_down(du->lock);
- du->users++;
+ du->users += val;
+
+ flist_for_each(n, &du->slavelist) {
+ struct disk_util *slave;
+
+ slave = flist_entry(n, struct disk_util, slavelist);
+ slave->users += val;
+ }
fio_mutex_up(du->lock);
}
}
fio_mutex_up(du->lock);
}
}
+static inline void disk_util_inc(struct disk_util *du)
+{
+ disk_util_mod(du, 1);
+}
static inline void disk_util_dec(struct disk_util *du)
{
static inline void disk_util_dec(struct disk_util *du)
{
- if (du) {
- fio_mutex_down(du->lock);
- du->users--;
- fio_mutex_up(du->lock);
- }
+ disk_util_mod(du, -1);
}
#define DISK_UTIL_MSEC (250)
}
#define DISK_UTIL_MSEC (250)
+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 show_disk_util(void);
+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 void init_disk_util(struct thread_data *);
-extern void update_io_ticks(void);
+extern int update_io_ticks(void);
+extern void setup_disk_util(void);
+extern void disk_util_prune_entries(void);
#else
#else
-#define show_disk_util()
+#define print_disk_util(dus, agg, terse)
+#define show_disk_util(terse, parent)
+#define disk_util_prune_entries()
#define init_disk_util(td)
#define init_disk_util(td)
-#define update_io_ticks()
+#define setup_disk_util()
+static inline int update_io_ticks(void)
+{
+ return disk_util_exit;
+}
#endif
#endif
+static inline void disk_util_start_exit(void)
+{
+ disk_util_exit = 1;
+}
+
#endif
#endif