X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=stat.c;h=e6da4218ad9214f2741ca09142ce288c82101911;hb=08aae9a0d5f3d24152abd7515984439bbfd3c05d;hp=fc0abe0a82b573742d781fa6cde65fc768f9d105;hpb=b4a6a59a939f0e6554632de311e7d1d1b7633ccf;p=fio.git

diff --git a/stat.c b/stat.c
index fc0abe0a..e6da4218 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);
@@ -189,7 +189,7 @@ 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;
 
@@ -209,7 +209,7 @@ void init_disk_util(struct thread_data *td)
 		/*
 		 * must be a file, open "." in that path
 		 */
-		strcpy(foo, f->file_name);
+		strncpy(foo, f->file_name, PATH_MAX - 1);
 		p = dirname(foo);
 		if (stat(p, &st)) {
 			perror("disk util stat");
@@ -239,11 +239,13 @@ void init_disk_util(struct thread_data *td)
 			log_err("unknown sysfs layout\n");
 			return;
 		}
-		strcpy(tmp, 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);
 }
 
@@ -331,7 +333,7 @@ static void show_disk_util(void)
 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;
@@ -524,6 +526,8 @@ void show_run_stats(void)
 
 		show_disk_util();
 	}
+
+	free(runstats);
 }
 
 static inline void add_stat_sample(struct io_stat *is, unsigned long val)
@@ -570,9 +574,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)
@@ -584,7 +588,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];
 }