projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zbd: Fix job zone size initialization
[fio.git]
/
diskutil.h
diff --git
a/diskutil.h
b/diskutil.h
index ff8a5b065f5d8b9914a4160df53218cdab3d8e80..15ec681a449c4a9b34929933ab95f1c85b3c1257 100644
(file)
--- a/
diskutil.h
+++ b/
diskutil.h
@@
-3,8
+3,8
@@
#include "json.h"
#define FIO_DU_NAME_SZ 64
#include "json.h"
#define FIO_DU_NAME_SZ 64
-#include "lib/output_buffer.h"
#include "helper_thread.h"
#include "helper_thread.h"
+#include "fio_sem.h"
struct disk_util_stats {
uint64_t ios[2];
struct disk_util_stats {
uint64_t ios[2];
@@
-46,7
+46,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;
@@
-65,9
+64,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;
};
@@
-76,7
+75,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) {
@@
-85,7
+84,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)
@@
-115,6
+114,7
@@
extern int update_io_ticks(void);
extern void setup_disk_util(void);
extern void disk_util_prune_entries(void);
#else
extern void setup_disk_util(void);
extern void disk_util_prune_entries(void);
#else
+/* keep this as a function to avoid a warning in handle_du() */
static inline void print_disk_util(struct disk_util_stat *du,
struct disk_util_agg *agg, int terse,
struct buf_output *out)
static inline void print_disk_util(struct disk_util_stat *du,
struct disk_util_agg *agg, int terse,
struct buf_output *out)