Browse Source

fix memory leaks

Samuel Thibault 10 years ago
parent
commit
a45d11f61f
3 changed files with 16 additions and 5 deletions
  1. 6 0
      tests/disk/disk_compute.c
  2. 0 1
      tests/disk/disk_copy.c
  3. 10 4
      tests/disk/disk_pack.c

+ 6 - 0
tests/disk/disk_compute.c

@@ -189,6 +189,12 @@ enoent2:
 	starpu_free_flags(A, NX*sizeof(int), STARPU_MALLOC_COUNT);
 	starpu_free_flags(C, NX*sizeof(int), STARPU_MALLOC_COUNT);
 enoent:
+	unlink(path_file_start);
+	unlink(path_file_end);
+
+	free(path_file_start);
+	free(path_file_end);
+
 	FPRINTF(stderr, "Couldn't write data: ENOENT\n");
 	starpu_shutdown();
 	return STARPU_TEST_SKIPPED;

+ 0 - 1
tests/disk/disk_copy.c

@@ -122,7 +122,6 @@ int dotest(struct starpu_disk_ops *ops, void *param)
 			try = 0;
 		}
 
-	/* free last vectors */
 	starpu_free_flags(A, NX*sizeof(double), STARPU_MALLOC_COUNT);
 	starpu_free_flags(F, NX*sizeof(double), STARPU_MALLOC_COUNT);
 

+ 10 - 4
tests/disk/disk_pack.c

@@ -195,8 +195,8 @@ int dotest(struct starpu_disk_ops *ops, char *base)
 			try = 0;
 		}
 
-	starpu_free_flags(A, NX*sizeof(double), STARPU_MALLOC_COUNT);
-	starpu_free_flags(C, NX*sizeof(double), STARPU_MALLOC_COUNT);
+	starpu_free_flags(A, NX*sizeof(int), STARPU_MALLOC_COUNT);
+	starpu_free_flags(C, NX*sizeof(int), STARPU_MALLOC_COUNT);
 
 	unlink(path_file_start);
 	unlink(path_file_end);
@@ -216,9 +216,15 @@ int dotest(struct starpu_disk_ops *ops, char *base)
 enodev:
 	return STARPU_TEST_SKIPPED;
 enoent2:
-	starpu_free_flags(A, NX*sizeof(double), STARPU_MALLOC_COUNT);
-	starpu_free_flags(C, NX*sizeof(double), STARPU_MALLOC_COUNT);
+	starpu_free_flags(A, NX*sizeof(int), STARPU_MALLOC_COUNT);
+	starpu_free_flags(C, NX*sizeof(int), STARPU_MALLOC_COUNT);
 enoent:
+	unlink(path_file_start);
+	unlink(path_file_end);
+
+	free(path_file_start);
+	free(path_file_end);
+
 	FPRINTF(stderr, "Couldn't write data: ENOENT\n");
 	starpu_shutdown();
 	return STARPU_TEST_SKIPPED;