diff mbox

[i-g-t] tests/gem_fenced_exec_thrash.c: Fix memory leaks

Message ID 1435314150-12662-1-git-send-email-derek.j.morton@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Derek Morton June 26, 2015, 10:22 a.m. UTC
gem_fenced_exec_thrash was not freeing any resources between
subtests. On 1Gb android systems this resulted in the test
failing with an OOM error.

Added cleanup code to free BOs at the end of each subtest.

Signed-off-by: Derek Morton <derek.j.morton@intel.com>
---
 tests/gem_fenced_exec_thrash.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Chris Wilson June 26, 2015, 10:51 a.m. UTC | #1
On Fri, Jun 26, 2015 at 11:22:30AM +0100, Derek Morton wrote:
> gem_fenced_exec_thrash was not freeing any resources between
> subtests. On 1Gb android systems this resulted in the test
> failing with an OOM error.
> 
> Added cleanup code to free BOs at the end of each subtest.
> 
> Signed-off-by: Derek Morton <derek.j.morton@intel.com>

Thanks, pushed

commit c69b13578399915f71f4ccc10cae188c31381c6a
Author: Derek Morton <derek.j.morton@intel.com>
Date:   Fri Jun 26 11:36:00 2015 +0100

    igt/gem_fenced_exec_thrash: Fix memory leak between tests
-Chris
>
diff mbox

Patch

diff --git a/tests/gem_fenced_exec_thrash.c b/tests/gem_fenced_exec_thrash.c
index 75f251c..c0e820f 100644
--- a/tests/gem_fenced_exec_thrash.c
+++ b/tests/gem_fenced_exec_thrash.c
@@ -215,6 +215,18 @@  static void run_test(int fd, int num_fences, int expected_errno,
 
 	if (flags & INTERRUPTIBLE)
 		igt_stop_signal_helper();
+
+	/* Cleanup */
+	for (n = 0; n < 2*num_fences; n++)
+		gem_close(fd, exec[0][n].handle);
+
+	for (i = 0; i < 2; i++)
+		gem_close(fd, exec[i][2*num_fences].handle);
+
+	if (flags & BUSY_LOAD) {
+		intel_batchbuffer_free(batch);
+		drm_intel_bufmgr_destroy(bufmgr);
+	}
 }
 
 int fd;