From 7e356b2dee2e86f3684424fc6e903f1ef9f00ef4 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 14 Oct 2011 10:55:16 +0200
Subject: [PATCH] Memory leak fixes

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 fio.c     | 16 ++++++++++++----
 init.c    | 10 +++++++++-
 options.c | 37 +++++++++++++------------------------
 options.h |  2 ++
 parse.c   | 19 +++++++++++++++++++
 parse.h   |  1 +
 6 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/fio.c b/fio.c
index e5d3bbf3..856ca753 100644
--- a/fio.c
+++ b/fio.c
@@ -1361,7 +1361,6 @@ err:
 	if (td->o.write_iolog_file)
 		write_iolog_close(td);
 
-	options_mem_free(td);
 	td_set_runstate(td, TD_EXITED);
 	return (void *) (unsigned long) td->error;
 }
@@ -1773,11 +1772,17 @@ static void run_threads(void)
 
 int exec_run(void)
 {
+	struct thread_data *td;
+	int i;
+
 	if (nr_clients)
 		return fio_handle_clients();
-	if (exec_profile && load_profile(exec_profile))
-		return 1;
-
+	if (exec_profile) {
+		if (load_profile(exec_profile))
+			return 1;
+		free(exec_profile);
+		exec_profile = NULL;
+	}
 	if (!thread_number)
 		return 0;
 
@@ -1810,6 +1815,9 @@ int exec_run(void)
 		}
 	}
 
+	for_each_td(td, i)
+		fio_options_free(td);
+
 	cgroup_kill(cgroup_list);
 	sfree(cgroup_list);
 	sfree(cgroup_mnt);
diff --git a/init.c b/init.c
index fa71eea8..0ccb1857 100644
--- a/init.c
+++ b/init.c
@@ -318,6 +318,8 @@ static void put_job(struct thread_data *td)
 	if (td->error)
 		log_info("fio: %s\n", td->verror);
 
+	fio_options_free(td);
+
 	memset(&threads[td->thread_number - 1], 0, sizeof(*td));
 	thread_number--;
 }
@@ -1070,6 +1072,12 @@ int parse_jobs_ini(char *file, int is_buf, int stonewall_flag)
 	if (dump_cmdline)
 		log_info("\n");
 
+	i = 0;
+	while (i < nr_job_sections) {
+		free(job_sections[i]);
+		i++;
+	}
+
 	for (i = 0; i < num_opts; i++)
 		free(opts[i]);
 
@@ -1497,7 +1505,7 @@ int parse_options(int argc, char *argv[])
 	}
 
 	free(ini_file);
-	options_mem_free(&def_thread);
+	fio_options_free(&def_thread);
 
 	if (!thread_number) {
 		if (dump_cmdline)
diff --git a/options.c b/options.c
index 48bb2a4d..4207537e 100644
--- a/options.c
+++ b/options.c
@@ -2347,7 +2347,10 @@ int fio_show_option_help(const char *opt)
 	return show_cmd_help(options, opt);
 }
 
-static void __options_mem(struct thread_data *td, int alloc)
+/*
+ * dupe FIO_OPT_STR_STORE options
+ */
+void options_mem_dupe(struct thread_data *td)
 {
 	struct thread_options *o = &td->o;
 	struct fio_option *opt;
@@ -2359,32 +2362,13 @@ static void __options_mem(struct thread_data *td, int alloc)
 			continue;
 
 		ptr = (void *) o + opt->off1;
-		if (*ptr) {
-			if (alloc)
-				*ptr = strdup(*ptr);
-			else {
-				free(*ptr);
-				*ptr = NULL;
-			}
-		}
+		if (!*ptr)
+			ptr = td_var(o, opt->off1);
+		if (*ptr)
+			*ptr = strdup(*ptr);
 	}
 }
 
-/*
- * dupe FIO_OPT_STR_STORE options
- */
-void options_mem_dupe(struct thread_data *td)
-{
-	__options_mem(td, 1);
-}
-
-void options_mem_free(struct thread_data fio_unused *td)
-{
-#if 0
-	__options_mem(td, 0);
-#endif
-}
-
 unsigned int fio_get_kb_base(void *data)
 {
 	struct thread_data *td = data;
@@ -2465,3 +2449,8 @@ void del_opt_posval(const char *optname, const char *ival)
 		o->posval[i].help = NULL;
 	}
 }
+
+void fio_options_free(struct thread_data *td)
+{
+	options_free(options, td);
+}
diff --git a/options.h b/options.h
index c6c2086e..ed6b9c2d 100644
--- a/options.h
+++ b/options.h
@@ -15,6 +15,8 @@ extern char *exec_profile;
 
 void add_opt_posval(const char *, const char *, const char *);
 void del_opt_posval(const char *, const char *);
+struct thread_data;
+void fio_options_free(struct thread_data *);
 
 static inline int o_match(struct fio_option *o, const char *opt)
 {
diff --git a/parse.c b/parse.c
index 27e7336b..afbde61e 100644
--- a/parse.c
+++ b/parse.c
@@ -1094,3 +1094,22 @@ void options_init(struct fio_option *options)
 	for (o = &options[0]; o->name; o++)
 		option_init(o);
 }
+
+void options_free(struct fio_option *options, void *data)
+{
+	struct fio_option *o;
+	char **ptr;
+
+	dprint(FD_PARSE, "free options\n");
+
+	for (o = &options[0]; o->name; o++) {
+		if (o->type != FIO_OPT_STR_STORE)
+			continue;
+
+		ptr = td_var(data, o->off1);
+		if (*ptr) {
+			free(*ptr);
+			*ptr = NULL;
+		}
+	}
+}
diff --git a/parse.h b/parse.h
index f2265a43..cb0b48f5 100644
--- a/parse.h
+++ b/parse.h
@@ -72,6 +72,7 @@ extern int show_cmd_help(struct fio_option *, const char *);
 extern void fill_default_options(void *, struct fio_option *);
 extern void option_init(struct fio_option *);
 extern void options_init(struct fio_option *);
+extern void options_free(struct fio_option *, void *);
 
 extern void strip_blank_front(char **);
 extern void strip_blank_end(char *);
-- 
2.25.1