Browse Source

mpi/tests: minor fixes following valgrind bug detection

Nathalie Furmento 11 years ago
parent
commit
9df8a289c6
2 changed files with 13 additions and 7 deletions
  1. 4 1
      mpi/tests/insert_task_owner2.c
  2. 9 6
      mpi/tests/insert_task_owner_data.c

+ 4 - 1
mpi/tests/insert_task_owner2.c

@@ -113,7 +113,10 @@ int main(int argc, char **argv)
 		}
 		starpu_data_unregister(data_handles[i]);
 	}
-        FPRINTF(stderr, "[%d][local ptr] VALUES: %d %d %d %d\n", rank, values[0], values[1], values[2], values[3]);
+	if (rank == 0)
+	{
+		FPRINTF(stderr, "[%d][local ptr] VALUES: %d %d %d %d\n", rank, values[0], values[1], values[2], values[3]);
+	}
         FPRINTF(stderr, "[%d][end] VALUES: %d %d %d %d\n", rank, x[0], x[1], x[2], y);
 
 	free(values);

+ 9 - 6
mpi/tests/insert_task_owner_data.c

@@ -86,14 +86,17 @@ int main(int argc, char **argv)
 		{
 			starpu_data_acquire(data_handles[i], STARPU_R);
 			values[i] = *((int *)starpu_data_get_local_ptr(data_handles[i]));
-			starpu_data_release(data_handles[i]);
-
-			FPRINTF(stderr, "[%d][local ptr] VALUES: %d %d\n", rank, values[0], values[1]);
-		}
+			starpu_data_release(data_handles[i]);		}
 	}
 	ret = 0;
-	if (rank == 0 && (values[0] != 12 || values[1] != 144))
-		ret = EXIT_FAILURE;
+	if (rank == 0)
+	{
+		FPRINTF(stderr, "[%d][local ptr] VALUES: %d %d\n", rank, values[0], values[1]);
+		if (values[0] != 12 || values[1] != 144)
+		{
+			ret = EXIT_FAILURE;
+		}
+	}
 
 	starpu_data_unregister(data_handles[0]);
 	starpu_data_unregister(data_handles[1]);