Browse Source

tests: improve error checking mechanism

Nathalie Furmento 13 years ago
parent
commit
474caf3a4c

+ 3 - 1
tests/core/declare_deps_in_callback.c

@@ -28,12 +28,14 @@
 static void callback(void *arg)
 {
 	struct starpu_task *taskA, *taskB;
+	int ret;
 
 	taskA = starpu_get_current_task();
 	taskB = (struct starpu_task *) arg;
 
 	starpu_task_declare_deps_array(taskB, 1, &taskA);
-	starpu_task_submit(taskB);
+	ret = starpu_task_submit(taskB);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 }
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))

+ 2 - 1
tests/core/empty_task_sync_point.c

@@ -93,7 +93,8 @@ int main(int argc, char **argv)
 	ret = starpu_task_submit(taskF); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 
 	starpu_tag_t tag_array[2] = {tagE, tagF};
-	starpu_tag_wait_array(2, tag_array);
+	ret = starpu_tag_wait_array(2, tag_array);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_tag_wait_array");
 
 	starpu_shutdown();
 

+ 8 - 2
tests/core/insert_task.c

@@ -88,8 +88,14 @@ int main(int argc, char **argv)
 			    0);
 	task->cl_arg = arg_buffer;
 	task->cl_arg_size = arg_buffer_size;
-	starpu_task_submit(task);
-        starpu_task_wait_for_all();
+
+	ret = starpu_task_submit(task);
+	if (ret == -ENODEV) goto enodev;
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_insert_task");
+
+        ret = starpu_task_wait_for_all();
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait_for_all");
+
         for(i=0 ; i<2 ; i++) {
                 ret = starpu_data_acquire(data_handles[i], STARPU_R);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire");

+ 4 - 2
tests/core/multithreaded.c

@@ -46,7 +46,8 @@ static starpu_codelet dummy_codelet =
 
 void *thread_func(void *arg __attribute__((unused)))
 {
-	int i;
+	int i, ret;
+
 	for (i = 0; i < ntasks; i++)
 	{
 		struct starpu_task *task = starpu_task_create();
@@ -60,7 +61,8 @@ void *thread_func(void *arg __attribute__((unused)))
 		STARPU_ASSERT(!ret);
 	}
 
-	starpu_task_wait_for_all();
+	ret = starpu_task_wait_for_all();
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait_for_all");
 
 	return NULL;
 }

+ 1 - 1
tests/core/static_restartable.c

@@ -81,7 +81,7 @@ int main(int argc, char **argv)
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 
-		starpu_task_wait(&task);
+		ret = starpu_task_wait(&task);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait");
 	}
 

+ 2 - 2
tests/core/static_restartable_tag.c

@@ -85,8 +85,8 @@ int main(int argc, char **argv)
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 
-		starpu_tag_wait(tag);
-		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait");
+		ret = starpu_tag_wait(tag);
+		STARPU_CHECK_RETURN_VALUE(ret, "starpu_tag_wait");
 	}
 
 	gettimeofday(&end, NULL);

+ 1 - 1
tests/core/static_restartable_using_initializer.c

@@ -79,7 +79,7 @@ int main(int argc, char **argv)
 		if (ret == -ENODEV) goto enodev;
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 
-		starpu_task_wait(&task);
+		ret = starpu_task_wait(&task);
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait");
 	}
 

+ 6 - 4
tests/core/subgraph_repeat.c

@@ -72,11 +72,13 @@ static void callback_task_D(void *arg __attribute__((unused)))
 		PTHREAD_MUTEX_UNLOCK(&mutex);
 	}
 	else {
+		int ret;
+
 		/* Let's go for another iteration */
-		starpu_task_submit(&taskA);
-		starpu_task_submit(&taskB);
-		starpu_task_submit(&taskC);
-		starpu_task_submit(&taskD);
+		ret = starpu_task_submit(&taskA); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
+		ret = starpu_task_submit(&taskB); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
+		ret = starpu_task_submit(&taskC); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
+		ret = starpu_task_submit(&taskD); STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}
 }
 

+ 3 - 1
tests/core/subgraph_repeat_regenerate.c

@@ -73,8 +73,10 @@ static void callback_task_D(void *arg __attribute__((unused)))
 		PTHREAD_MUTEX_UNLOCK(&mutex);
 	}
 	else {
+		int ret;
 		/* Let's go for another iteration */
-		starpu_task_submit(&taskA);
+		ret = starpu_task_submit(&taskA);
+		STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_submit");
 	}
 }
 

+ 3 - 1
tests/datawizard/mpi_like_async.c

@@ -249,6 +249,7 @@ static void *thread_func(void *arg)
 	unsigned iter;
 	struct thread_data *thread_data = (struct thread_data *) arg;
 	unsigned index = thread_data->index;
+	int ret;
 
 	starpu_variable_data_register(&thread_data->handle, 0, (uintptr_t)&thread_data->val, sizeof(unsigned));
 
@@ -274,7 +275,8 @@ static void *thread_func(void *arg)
 		}
 	}
 
-	starpu_task_wait_for_all();
+	ret = starpu_task_wait_for_all();
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_task_wait_for_all");
 
 	return NULL;
 }

+ 2 - 1
tests/microbenchs/local_pingpong.c

@@ -50,7 +50,8 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* Create a piece of data */
-	starpu_malloc((void **)&v, vector_size);
+	ret = starpu_malloc((void **)&v, vector_size);
+	STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, vector_size, 1);
 
 	/* Find a pair of memory nodes */

+ 4 - 2
tests/microbenchs/tasks_overhead.c

@@ -45,7 +45,7 @@ static starpu_codelet dummy_codelet =
 	.nbuffers = 0
 };
 
-void inject_one_task(void)
+int inject_one_task(void)
 {
 	struct starpu_task *task = starpu_task_create();
 
@@ -54,7 +54,9 @@ void inject_one_task(void)
 	task->callback_func = NULL;
 	task->synchronous = 1;
 
-	starpu_task_submit(task);
+	int ret;
+	ret = starpu_task_submit(task);
+	return ret;
 }
 
 static void parse_args(int argc, char **argv)