X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=stat.c;h=731b3036544de363e9db4a82084cce1316203d1e;hp=d70c5ca9c7bcf78baeb9c591da10d6f88e10dc02;hb=690089990d051d86b4ef2b6fd5c1972c0dd4897b;hpb=3b70d7e51e0b672a8b337c57c8faf865c0b7f415

diff --git a/stat.c b/stat.c
index d70c5ca9..731b3036 100644
--- a/stat.c
+++ b/stat.c
@@ -60,7 +60,7 @@ static void update_io_tick_disk(struct disk_util *du)
 	dus->io_ticks += (__dus.io_ticks - ldus->io_ticks);
 	dus->time_in_queue += (__dus.time_in_queue - ldus->time_in_queue);
 
-	gettimeofday(&t, NULL);
+	fio_gettime(&t, NULL);
 	du->msec += mtime_since(&du->time, &t);
 	memcpy(&du->time, &t, sizeof(t));
 	memcpy(ldus, &__dus, sizeof(__dus));
@@ -102,7 +102,7 @@ static void disk_util_add(dev_t dev, char *path)
 	du->name = strdup(basename(path));
 	du->dev = dev;
 
-	gettimeofday(&du->time, NULL);
+	fio_gettime(&du->time, NULL);
 	get_io_ticks(du, &du->last_dus);
 
 	list_add_tail(&du->list, &disk_list);
@@ -156,8 +156,6 @@ static int find_block_dir(dev_t dev, char *path)
 
 		if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
 			continue;
-		if (!strcmp(dir->d_name, "device"))
-			continue;
 
 		sprintf(full_path, "%s/%s", path, dir->d_name);
 
@@ -168,7 +166,7 @@ static int find_block_dir(dev_t dev, char *path)
 			}
 		}
 
-		if (stat(full_path, &st) == -1) {
+		if (lstat(full_path, &st) == -1) {
 			perror("stat");
 			break;
 		}
@@ -189,15 +187,20 @@ static int find_block_dir(dev_t dev, char *path)
 
 void init_disk_util(struct thread_data *td)
 {
+	struct fio_file *f;
 	struct stat st;
-	char foo[256], tmp[256];
+	char foo[PATH_MAX], tmp[PATH_MAX];
 	dev_t dev;
 	char *p;
 
 	if (!td->do_disk_util)
 		return;
 
-	if (!stat(td->file_name, &st)) {
+	/*
+	 * Just use the same file, they are on the same device.
+	 */
+	f = &td->files[0];
+	if (!stat(f->file_name, &st)) {
 		if (S_ISBLK(st.st_mode))
 			dev = st.st_rdev;
 		else
@@ -206,7 +209,7 @@ void init_disk_util(struct thread_data *td)
 		/*
 		 * must be a file, open "." in that path
 		 */
-		strcpy(foo, td->file_name);
+		strncpy(foo, f->file_name, PATH_MAX - 1);
 		p = dirname(foo);
 		if (stat(p, &st)) {
 			perror("disk util stat");
@@ -236,10 +239,13 @@ void init_disk_util(struct thread_data *td)
 			log_err("unknown sysfs layout\n");
 			return;
 		}
-		sprintf(foo, "%s", p);
+		strncpy(tmp, p, PATH_MAX - 1);
+		sprintf(foo, "%s", tmp);
 	}
 
-	td->sysfs_root = strdup(foo);
+	if (td->ioscheduler)
+		td->sysfs_root = strdup(foo);
+
 	disk_util_add(dev, foo);
 }
 
@@ -252,9 +258,6 @@ void disk_util_timer_arm(void)
 
 void update_rusage_stat(struct thread_data *td)
 {
-	if (!(td->runtime[0] + td->runtime[1]))
-		return;
-
 	getrusage(RUSAGE_SELF, &td->ru_end);
 
 	td->usr_time += mtime_since(&td->ru_start.ru_utime, &td->ru_end.ru_utime);
@@ -279,8 +282,6 @@ static int calc_lat(struct io_stat *is, unsigned long *min, unsigned long *max,
 	n = (double) is->samples;
 	*mean = (double) is->val / n;
 	*dev = sqrt(((double) is->val_sq - (*mean * *mean) / n) / (n - 1));
-	if (!(*min + *max) && !(*mean + *dev))
-		return 0;
 
 	return 1;
 }
@@ -298,7 +299,7 @@ static void show_group_stats(struct group_run_stats *rs, int id)
 static void show_disk_util(void)
 {
 	struct disk_util_stat *dus;
-	struct list_head *entry;
+	struct list_head *entry, *next;
 	struct disk_util *du;
 	double util;
 
@@ -314,12 +315,22 @@ static void show_disk_util(void)
 
 		fprintf(f_out, "  %s: ios=%u/%u, merge=%u/%u, ticks=%u/%u, in_queue=%u, util=%3.2f%%\n", du->name, dus->ios[0], dus->ios[1], dus->merges[0], dus->merges[1], dus->ticks[0], dus->ticks[1], dus->time_in_queue, util);
 	}
+
+	/*
+	 * now free the list
+	 */
+	list_for_each_safe(entry, next, &disk_list) {
+		list_del(entry);
+		du = list_entry(entry, struct disk_util, list);
+		free(du->name);
+		free(du);
+	}
 }
 
 static void show_ddir_status(struct thread_data *td, struct group_run_stats *rs,
 			     int ddir)
 {
-	char *ddir_str[] = { "read ", "write" };
+	const char *ddir_str[] = { "read ", "write" };
 	unsigned long min, max;
 	unsigned long long bw;
 	double mean, dev;
@@ -348,6 +359,7 @@ static void show_thread_status(struct thread_data *td,
 			       struct group_run_stats *rs)
 {
 	double usr_cpu, sys_cpu;
+	unsigned long runtime;
 
 	if (!(td->io_bytes[0] + td->io_bytes[1]) && !td->error)
 		return;
@@ -358,6 +370,64 @@ static void show_thread_status(struct thread_data *td,
 	if (td->io_bytes[td->ddir ^ 1])
 		show_ddir_status(td, rs, td->ddir ^ 1);
 
+	runtime = mtime_since(&td->epoch, &td->end_time);
+	if (runtime) {
+		double runt = runtime;
+
+		usr_cpu = (double) td->usr_time * 100 / runt;
+		sys_cpu = (double) td->sys_time * 100 / runt;
+	} else {
+		usr_cpu = 0;
+		sys_cpu = 0;
+	}
+
+	fprintf(f_out, "  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, td->ctx);
+}
+
+static void show_ddir_status_terse(struct thread_data *td,
+				   struct group_run_stats *rs, int ddir)
+{
+	unsigned long min, max;
+	unsigned long long bw;
+	double mean, dev;
+
+	bw = 0;
+	if (td->runtime[ddir])
+		bw = td->io_bytes[ddir] / td->runtime[ddir];
+
+	fprintf(f_out, ",%llu,%llu,%lu", td->io_bytes[ddir] >> 10, bw, td->runtime[ddir]);
+
+	if (calc_lat(&td->slat_stat[ddir], &min, &max, &mean, &dev))
+		fprintf(f_out, ",%lu,%lu,%f,%f", min, max, mean, dev);
+	else
+		fprintf(f_out, ",%lu,%lu,%f,%f", 0UL, 0UL, 0.0, 0.0);
+
+	if (calc_lat(&td->clat_stat[ddir], &min, &max, &mean, &dev))
+		fprintf(f_out, ",%lu,%lu,%f,%f", min, max, mean, dev);
+	else
+		fprintf(f_out, ",%lu,%lu,%f,%f", 0UL, 0UL, 0.0, 0.0);
+
+	if (calc_lat(&td->bw_stat[ddir], &min, &max, &mean, &dev)) {
+		double p_of_agg;
+
+		p_of_agg = mean * 100 / (double) rs->agg[ddir];
+		fprintf(f_out, ",%lu,%lu,%f%%,%f,%f", min, max, p_of_agg, mean, dev);
+	} else
+		fprintf(f_out, ",%lu,%lu,%f%%,%f,%f", 0UL, 0UL, 0.0, 0.0, 0.0);
+		
+}
+
+
+static void show_thread_status_terse(struct thread_data *td,
+				     struct group_run_stats *rs)
+{
+	double usr_cpu, sys_cpu;
+
+	fprintf(f_out, "%s,%d,%d",td->name, td->groupid, td->error);
+
+	show_ddir_status_terse(td, rs, 0);
+	show_ddir_status_terse(td, rs, 1);
+
 	if (td->runtime[0] + td->runtime[1]) {
 		double runt = td->runtime[0] + td->runtime[1];
 
@@ -368,7 +438,7 @@ static void show_thread_status(struct thread_data *td,
 		sys_cpu = 0;
 	}
 
-	fprintf(f_out, "  cpu          : usr=%3.2f%%, sys=%3.2f%%, ctx=%lu\n", usr_cpu, sys_cpu, td->ctx);
+	fprintf(f_out, ",%f%%,%f%%,%lu\n", usr_cpu, sys_cpu, td->ctx);
 }
 
 void show_run_stats(void)
@@ -387,11 +457,9 @@ void show_run_stats(void)
 		rs->min_bw[1] = rs->min_run[1] = ~0UL;
 	}
 
-	for (i = 0; i < thread_number; i++) {
+	for_each_td(td, i) {
 		unsigned long long rbw, wbw;
 
-		td = &threads[i];
-
 		if (td->error) {
 			fprintf(f_out, "%s: %s\n", td->name, td->verror);
 			continue;
@@ -439,19 +507,26 @@ void show_run_stats(void)
 	/*
 	 * don't overwrite last signal output
 	 */
-	printf("\n");
+	if (!terse_output)
+		printf("\n");
 
-	for (i = 0; i < thread_number; i++) {
-		td = &threads[i];
+	for_each_td(td, i) {
 		rs = &runstats[td->groupid];
 
-		show_thread_status(td, rs);
+		if (terse_output)
+			show_thread_status_terse(td, rs);
+		else
+			show_thread_status(td, rs);
 	}
 
-	for (i = 0; i < groupid + 1; i++)
-		show_group_stats(&runstats[i], i);
+	if (!terse_output) {
+		for (i = 0; i < groupid + 1; i++)
+			show_group_stats(&runstats[i], i);
+
+		show_disk_util();
+	}
 
-	show_disk_util();
+	free(runstats);
 }
 
 static inline void add_stat_sample(struct io_stat *is, unsigned long val)
@@ -498,9 +573,9 @@ void add_slat_sample(struct thread_data *td, int ddir, unsigned long msec)
 		add_log_sample(td, td->slat_log, msec, ddir);
 }
 
-void add_bw_sample(struct thread_data *td, int ddir)
+void add_bw_sample(struct thread_data *td, int ddir, struct timeval *t)
 {
-	unsigned long spent = mtime_since_now(&td->stat_sample_time[ddir]);
+	unsigned long spent = mtime_since(&td->stat_sample_time[ddir], t);
 	unsigned long rate;
 
 	if (spent < td->bw_avg_time)
@@ -512,7 +587,7 @@ void add_bw_sample(struct thread_data *td, int ddir)
 	if (td->bw_log)
 		add_log_sample(td, td->bw_log, rate, ddir);
 
-	gettimeofday(&td->stat_sample_time[ddir], NULL);
+	fio_gettime(&td->stat_sample_time[ddir], NULL);
 	td->stat_io_bytes[ddir] = td->this_io_bytes[ddir];
 }