X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=diskutil.c;h=9fc309563ea55772125f81bd97389d7988cb82fe;hp=82b393ac92f4f2f4c2e4bc0b6c962ef1a8874589;hb=f6bb5b88614073878cbbd2666a1553481720faee;hpb=043b74b9ddba4cc7ecb876ca41b7daa7d1ec5da3

diff --git a/diskutil.c b/diskutil.c
index 82b393ac..9fc30956 100644
--- a/diskutil.c
+++ b/diskutil.c
@@ -8,11 +8,35 @@
 #include <math.h>
 
 #include "fio.h"
+#include "smalloc.h"
+#include "diskutil.h"
 
 static int last_majdev, last_mindev;
+static struct disk_util *last_du;
 
 static struct flist_head disk_list = FLIST_HEAD_INIT(disk_list);
 
+static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
+		int majdev, int mindev, char *path);
+
+static void disk_util_free(struct disk_util *du)
+{
+	if (du == last_du)
+		last_du = NULL;
+
+	while (!flist_empty(&du->slaves)) {
+		struct disk_util *slave;
+
+		slave = flist_entry(du->slaves.next, struct disk_util, slavelist);
+		flist_del(&slave->slavelist);
+		slave->users--;
+	}
+	
+	fio_mutex_remove(du->lock);
+	sfree(du->name);
+	sfree(du);
+}
+
 static int get_io_ticks(struct disk_util *du, struct disk_util_stat *dus)
 {
 	unsigned in_flight;
@@ -51,6 +75,8 @@ static void update_io_tick_disk(struct disk_util *du)
 	struct disk_util_stat __dus, *dus, *ldus;
 	struct timeval t;
 
+	if (!du->users)
+		return;
 	if (get_io_ticks(du, &__dus))
 		return;
 
@@ -167,12 +193,8 @@ static int read_block_dev_entry(char *path, int *maj, int *min)
 	return 0;
 }
 
-
-static void __init_per_file_disk_util(struct thread_data *td, int majdev,
-		int mindev, char * path);
-
 static void find_add_disk_slaves(struct thread_data *td, char *path,
-		struct disk_util *masterdu)
+				 struct disk_util *masterdu)
 {
 	DIR *dirhandle = NULL;
 	struct dirent *dirent = NULL;
@@ -181,13 +203,14 @@ static void find_add_disk_slaves(struct thread_data *td, char *path,
 	int majdev, mindev;
 	ssize_t linklen;
 
-	sprintf(slavesdir, "%s/%s",path, "slaves");
+	sprintf(slavesdir, "%s/%s", path, "slaves");
 	dirhandle = opendir(slavesdir);
 	if (!dirhandle)
 		return;
 
 	while ((dirent = readdir(dirhandle)) != NULL) {
-		if (!strcmp(dirent->d_name, ".") || !strcmp(dirent->d_name, ".."))
+		if (!strcmp(dirent->d_name, ".") ||
+		    !strcmp(dirent->d_name, ".."))
 			continue;
 
 		sprintf(temppath, "%s/%s", slavesdir, dirent->d_name);
@@ -195,11 +218,12 @@ static void find_add_disk_slaves(struct thread_data *td, char *path,
 		 * are links to the real directories for the slave
 		 * devices?
 		 */
-		if ((linklen = readlink(temppath, slavepath, PATH_MAX-1)) < 0) {
+		linklen = readlink(temppath, slavepath, PATH_MAX - 0);
+		if (linklen  < 0) {
 			perror("readlink() for slave device.");
 			return;
 		}
-		slavepath[linklen]='\0';
+		slavepath[linklen] = '\0';
 
 		sprintf(temppath, "%s/%s/dev", slavesdir, slavepath);
 		if (read_block_dev_entry(temppath, &majdev, &mindev)) {
@@ -207,40 +231,48 @@ static void find_add_disk_slaves(struct thread_data *td, char *path,
 			return;
 		}
 
+		/*
+		 * See if this maj,min already exists
+		 */
+		slavedu = disk_util_exists(majdev, mindev);
+		if (slavedu)
+			continue;
+
 		sprintf(temppath, "%s/%s", slavesdir, slavepath);
 		__init_per_file_disk_util(td, majdev, mindev, temppath);
 		slavedu = disk_util_exists(majdev, mindev);
 
 		/* Should probably use an assert here. slavedu should
 		 * always be present at this point. */
-		if (slavedu)
+		if (slavedu) {
+			slavedu->users++;
 			flist_add_tail(&slavedu->slavelist, &masterdu->slaves);
+		}
 	}
 
 	closedir(dirhandle);
-	return;
 }
 
-
-
-static void disk_util_add(struct thread_data * td, int majdev, int mindev,
-		char *path)
+static struct disk_util *disk_util_add(struct thread_data *td, int majdev,
+				       int mindev, char *path)
 {
 	struct disk_util *du, *__du;
 	struct flist_head *entry;
 
 	dprint(FD_DISKUTIL, "add maj/min %d/%d: %s\n", majdev, mindev, path);
 
-	du = malloc(sizeof(*du));
+	du = smalloc(sizeof(*du));
 	memset(du, 0, sizeof(*du));
 	INIT_FLIST_HEAD(&du->list);
 	sprintf(du->path, "%s/stat", path);
-	du->name = strdup(basename(path));
+	du->name = smalloc_strdup(basename(path));
 	du->sysfs_root = path;
 	du->major = majdev;
 	du->minor = mindev;
 	INIT_FLIST_HEAD(&du->slavelist);
 	INIT_FLIST_HEAD(&du->slaves);
+	du->lock = fio_mutex_init(1);
+	du->users = 0;
 
 	flist_for_each(entry, &disk_list) {
 		__du = flist_entry(entry, struct disk_util, list);
@@ -248,9 +280,8 @@ static void disk_util_add(struct thread_data * td, int majdev, int mindev,
 		dprint(FD_DISKUTIL, "found %s in list\n", __du->name);
 
 		if (!strcmp(du->name, __du->name)) {
-			free(du->name);
-			free(du);
-			return;
+			disk_util_free(du);
+			return __du;
 		}
 	}
 
@@ -261,9 +292,9 @@ static void disk_util_add(struct thread_data * td, int majdev, int mindev,
 
 	flist_add_tail(&du->list, &disk_list);
 	find_add_disk_slaves(td, path, du);
+	return du;
 }
 
-
 static int check_dev_match(int majdev, int mindev, char *path)
 {
 	int major, minor;
@@ -271,9 +302,8 @@ static int check_dev_match(int majdev, int mindev, char *path)
 	if (read_block_dev_entry(path, &major, &minor))
 		return 1;
 
-	if (majdev == major && mindev == minor) {
+	if (majdev == major && mindev == minor)
 		return 0;
-	}
 
 	return 1;
 }
@@ -330,9 +360,9 @@ static int find_block_dir(int majdev, int mindev, char *path, int link_ok)
 	return found;
 }
 
-
-static void __init_per_file_disk_util(struct thread_data *td, int majdev,
-		int mindev, char * path)
+static struct disk_util *__init_per_file_disk_util(struct thread_data *td,
+						   int majdev, int mindev,
+						   char *path)
 {
 	struct stat st;
 	char tmp[PATH_MAX];
@@ -349,7 +379,7 @@ static void __init_per_file_disk_util(struct thread_data *td, int majdev,
 		sprintf(tmp, "%s/queue", p);
 		if (stat(tmp, &st)) {
 			log_err("unknown sysfs layout\n");
-			return;
+			return NULL;
 		}
 		strncpy(tmp, p, PATH_MAX - 1);
 		sprintf(path, "%s", tmp);
@@ -358,20 +388,19 @@ static void __init_per_file_disk_util(struct thread_data *td, int majdev,
 	if (td->o.ioscheduler && !td->sysfs_root)
 		td->sysfs_root = strdup(path);
 
-	disk_util_add(td, majdev, mindev, path);
+	return disk_util_add(td, majdev, mindev, path);
 }
 
-
-
-static void init_per_file_disk_util(struct thread_data *td, char * filename)
+static struct disk_util *init_per_file_disk_util(struct thread_data *td,
+						 char *filename)
 {
 
 	char foo[PATH_MAX];
 	struct disk_util *du;
 	int mindev, majdev;
 
-	if(get_device_numbers(filename, &majdev, &mindev))
-		return;
+	if (get_device_numbers(filename, &majdev, &mindev))
+		return NULL;
 
 	dprint(FD_DISKUTIL, "%s belongs to maj/min %d/%d\n", filename, majdev,
 			mindev);
@@ -381,7 +410,7 @@ static void init_per_file_disk_util(struct thread_data *td, char * filename)
 		if (td->o.ioscheduler && !td->sysfs_root)
 			td->sysfs_root = strdup(du->sysfs_root);
 
-		return;
+		return du;
 	}
 
 	/*
@@ -391,20 +420,20 @@ static void init_per_file_disk_util(struct thread_data *td, char * filename)
 	 * everything again.
 	 */
 	if (mindev == last_mindev && majdev == last_majdev)
-		return;
+		return last_du;
 
 	last_mindev = mindev;
 	last_majdev = majdev;
 
 	sprintf(foo, "/sys/block");
 	if (!find_block_dir(majdev, mindev, foo, 1))
-		return;
-
-	__init_per_file_disk_util(td, majdev, mindev, foo);
+		return NULL;
 
+	return __init_per_file_disk_util(td, majdev, mindev, foo);
 }
 
-static void __init_disk_util(struct thread_data *td, struct fio_file *f)
+static struct disk_util *__init_disk_util(struct thread_data *td,
+					  struct fio_file *f)
 {
 	return init_per_file_disk_util(td, f->file_name);
 }
@@ -419,7 +448,7 @@ void init_disk_util(struct thread_data *td)
 		return;
 
 	for_each_file(td, f, i)
-		__init_disk_util(td, f);
+		f->du = __init_disk_util(td, f);
 }
 
 static void aggregate_slaves_stats(struct disk_util *masterdu)
@@ -430,11 +459,11 @@ static void aggregate_slaves_stats(struct disk_util *masterdu)
 	double util, max_util = 0;
 	int slavecount = 0;
 
-	unsigned merges[2];
-	unsigned ticks[2];
-	unsigned time_in_queue;
-	unsigned long long sectors[2];
-	unsigned ios[2];
+	unsigned merges[2] = { 0, };
+	unsigned ticks[2] = { 0, };
+	unsigned time_in_queue = { 0, };
+	unsigned long long sectors[2] = { 0, };
+	unsigned ios[2] = { 0, };
 
 	flist_for_each(entry, &masterdu->slaves) {
 		slavedu = flist_entry(entry, struct disk_util, slavelist);
@@ -471,8 +500,6 @@ static void aggregate_slaves_stats(struct disk_util *masterdu)
 
 }
 
-
-
 void show_disk_util(void)
 {
 	struct disk_util_stat *dus;
@@ -501,7 +528,7 @@ void show_disk_util(void)
 		 * the master's stats line has been displayed in a
 		 * previous iteration of this loop.
 		 */
-		if(!flist_empty(&du->slavelist))
+		if (!flist_empty(&du->slavelist))
 			log_info("  ");
 
 		log_info("  %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, "
@@ -514,7 +541,7 @@ void show_disk_util(void)
 		/* If the device has slaves, aggregate the stats for
 		 * those slave devices also.
 		 */
-		if(!flist_empty(&du->slaves))
+		if (!flist_empty(&du->slaves))
 			aggregate_slaves_stats(du);
 
 		log_info("\n");
@@ -526,7 +553,6 @@ void show_disk_util(void)
 	flist_for_each_safe(entry, next, &disk_list) {
 		flist_del(entry);
 		du = flist_entry(entry, struct disk_util, list);
-		free(du->name);
-		free(du);
+		disk_util_free(du);
 	}
 }