X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.h;h=15ec681a449c4a9b34929933ab95f1c85b3c1257;hp=35fd0a5953b97c130f331c4691d9d4e6067450f5;hb=01bf5128d0581e267383f280c6a1dcd26517240f;hpb=7c9b1bce094d58c374b086bbb780c08265623ea4

diff --git a/diskutil.h b/diskutil.h
index 35fd0a59..15ec681a 100644
--- a/diskutil.h
+++ b/diskutil.h
@@ -1,16 +1,39 @@
 #ifndef FIO_DISKUTIL_H
 #define FIO_DISKUTIL_H
+#include "json.h"
+#define FIO_DU_NAME_SZ		64
+
+#include "helper_thread.h"
+#include "fio_sem.h"
+
+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 {
-	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];
+	struct disk_util_stats s;
+};
+
+struct disk_util_agg {
+	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;
+	uint32_t slavecount;
+	uint32_t pad;
+	fio_fp64_t max_util;
 };
 
 /*
@@ -23,14 +46,15 @@ struct disk_util {
 	 */
 	struct flist_head slavelist;
 
-	char *name;
 	char *sysfs_root;
-	char path[256];
+	char path[PATH_MAX];
 	int major, minor;
 
 	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
@@ -40,44 +64,72 @@ struct disk_util {
 	 */
 	struct flist_head slaves;
 
-	unsigned long msec;
-	struct timeval time;
+	struct timespec time;
 
-	struct fio_mutex *lock;
+	struct fio_sem *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) {
-		fio_mutex_down(du->lock);
-		du->users++;
-		fio_mutex_up(du->lock);
+		struct flist_head *n;
+
+		fio_sem_down(du->lock);
+		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_sem_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)
 {
-	if (du) {
-		fio_mutex_down(du->lock);
-		du->users--;
-		fio_mutex_up(du->lock);
-	}
+	disk_util_mod(du, -1);
 }
 
 #define DISK_UTIL_MSEC	(250)
 
+extern struct flist_head disk_list;
+
 /*
  * 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, struct buf_output *);
+extern void show_disk_util(int terse, struct json_object *parent, struct buf_output *);
+extern void json_array_add_disk_util(struct disk_util_stat *dus,
+		struct disk_util_agg *agg, struct json_array *parent);
 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
-#define show_disk_util()
+/* 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)
+{
+}
+#define show_disk_util(terse, parent, out)
+#define disk_util_prune_entries()
 #define init_disk_util(td)
-#define update_io_ticks()
+#define setup_disk_util()
+#define json_array_add_disk_util(dus, agg, parent)
+
+static inline int update_io_ticks(void)
+{
+	return helper_should_exit();
+}
 #endif
 
 #endif