From 88c6ed8085efd1403fd34072311991cb666a5b9e Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Fri, 9 Jun 2006 11:28:10 +0200
Subject: [PATCH 1/1] [PATCH] Misc: stall progress ouput during file creation,
 ini_file frees.

---
 fio.c  | 9 +++++++++
 init.c | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/fio.c b/fio.c
index 3cc09891..b53a58eb 100644
--- a/fio.c
+++ b/fio.c
@@ -43,6 +43,7 @@ int thread_number = 0;
 static char run_str[MAX_JOBS + 1];
 int shm_id = 0;
 static struct timeval genesis;
+static int temp_stall_ts;
 
 static void print_thread_status(void);
 
@@ -960,6 +961,8 @@ static int create_file(struct thread_data *td, unsigned long long size,
 		return 1;
 	}
 
+	temp_stall_ts = 1;
+
 	if (!extend) {
 		oflags = O_CREAT | O_TRUNC;
 		fprintf(f_out, "%s: Laying out IO file (%LuMiB)\n", td->name, size >> 20);
@@ -971,11 +974,13 @@ static int create_file(struct thread_data *td, unsigned long long size,
 	td->fd = open(td->file_name, O_WRONLY | oflags, 0644);
 	if (td->fd < 0) {
 		td_verror(td, errno);
+		temp_stall_ts = 0;
 		return 1;
 	}
 
 	if (!extend && ftruncate(td->fd, td->file_size) == -1) {
 		td_verror(td, errno);
+		temp_stall_ts = 0;
 		return 1;
 	}
 
@@ -1009,6 +1014,7 @@ static int create_file(struct thread_data *td, unsigned long long size,
 	else if (td->create_fsync)
 		fsync(td->fd);
 
+	temp_stall_ts = 0;
 	close(td->fd);
 	td->fd = -1;
 	free(b);
@@ -1570,6 +1576,9 @@ static void print_thread_status(void)
 	char eta_str[32];
 	double perc = 0.0;
 
+	if (temp_stall_ts)
+		return;
+
 	eta_secs = malloc(thread_number * sizeof(int));
 	memset(eta_secs, 0, thread_number * sizeof(int));
 
diff --git a/init.c b/init.c
index de9cb498..ee9ab7d2 100644
--- a/init.c
+++ b/init.c
@@ -1118,7 +1118,9 @@ int parse_options(int argc, char *argv[])
 			return 1;
 		if (parse_jobs_ini(ini_file[i]))
 			return 1;
+		free(ini_file[i]);
 	}
 
+	free(ini_file);
 	return 0;
 }
-- 
2.25.1