From: Jens Axboe <axboe@fb.com>
Date: Tue, 11 Feb 2014 17:33:06 +0000 (-0700)
Subject: Plug a free basic memory leaks
X-Git-Tag: fio-2.1.5~2
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=eb0c74ae74ce458dd55b7a7d11c5ba7ae59bf5ed

Plug a free basic memory leaks

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/cconv.c b/cconv.c
index 0d30f07d..b7d469e9 100644
--- a/cconv.c
+++ b/cconv.c
@@ -18,6 +18,29 @@ static void string_to_net(uint8_t *dst, const char *src)
 		dst[0] = '\0';
 }
 
+void free_thread_options_to_cpu(struct thread_options *o)
+{
+	free(o->description);
+	free(o->name);
+	free(o->directory);
+	free(o->filename);
+	free(o->filename_format);
+	free(o->opendir);
+	free(o->ioengine);
+	free(o->mmapfile);
+	free(o->read_iolog_file);
+	free(o->write_iolog_file);
+	free(o->bw_log_file);
+	free(o->lat_log_file);
+	free(o->iops_log_file);
+	free(o->replay_redirect);
+	free(o->exec_prerun);
+	free(o->exec_postrun);
+	free(o->ioscheduler);
+	free(o->profile);
+	free(o->cgroup);
+}
+
 void convert_thread_options_to_cpu(struct thread_options *o,
 				   struct thread_options_pack *top)
 {
@@ -438,5 +461,7 @@ int fio_test_cconv(struct thread_options *__o)
 	convert_thread_options_to_cpu(&o, &top1);
 	convert_thread_options_to_net(&top2, &o);
 
+	free_thread_options_to_cpu(&o);
+
 	return memcmp(&top1, &top2, sizeof(top1));
 }
diff --git a/init.c b/init.c
index b26dc9fe..fa1df8e7 100644
--- a/init.c
+++ b/init.c
@@ -250,6 +250,7 @@ void free_shm(void)
 		free_threads_shm();
 	}
 
+	options_free(fio_options, &def_thread);
 	scleanup();
 }