rename starpu_wait_task into starpu_task_wait

doc/starpu.texi

@@ -687,7 +687,7 @@ TODO
 * starpu_task_deinit::            Release all the resources used by a Task
 * starpu_task_destroy::           Destroy a dynamically allocated Task
 * starpu_submit_task::            Submit a Task
-* starpu_wait_task::              Wait for the termination of a Task
+* starpu_task_wait::              Wait for the termination of a Task
 * starpu_wait_all_tasks::	  Wait for the termination of all Tasks
 @end menu
 
@@ -829,8 +829,8 @@ returned by @code{starpu_get_worker_id}). This field is ignored if
 
 @item @code{detach} (optional) (default = 1):
 If this flag is set, it is not possible to synchronize with the task
-by the means of @code{starpu_wait_task} later on. Internal data structures
-are only guaranteed to be liberated once @code{starpu_wait_task} is called
+by the means of @code{starpu_task_wait} later on. Internal data structures
+are only guaranteed to be liberated once @code{starpu_task_wait} is called
 if that flag is not set.
 
 @item @code{destroy} (optional) (default = 1):
@@ -899,8 +899,8 @@ behaviour.
 @code{void starpu_task_destroy(struct starpu_task *task);}
 @end table
 
-@node starpu_wait_task
-@subsection @code{starpu_wait_task} -- Wait for the termination of a Task
+@node starpu_task_wait
+@subsection @code{starpu_task_wait} -- Wait for the termination of a Task
 @table @asis
 @item @emph{Description}:
 This function blocks until the task was executed. It is not possible to
@@ -910,7 +910,7 @@ synchronous or detached tasks.
 Upon successful completion, this function returns 0. Otherwise, @code{-EINVAL}
 indicates that the waited task was either synchronous or detached.
 @item @emph{Prototype}:
-@code{int starpu_wait_task(struct starpu_task *task);}
+@code{int starpu_task_wait(struct starpu_task *task);}
 @end table
 
 

include/starpu_task.h

@@ -97,8 +97,8 @@ struct starpu_task {
 	unsigned workerid;
 
 	/* If this flag is set, it is not possible to synchronize with the task
-	 * by the means of starpu_wait_task later on. Internal data structures
-	 * are only garanteed to be liberated once starpu_wait_task is called
+	 * by the means of starpu_task_wait later on. Internal data structures
+	 * are only garanteed to be liberated once starpu_task_wait is called
 	 * if that flag is not set. */
 	int detach;
 
@@ -208,7 +208,7 @@ int starpu_submit_task(struct starpu_task *task);
  * synchronous or detached tasks.
  * Upon successful completion, this function returns 0. Otherwise, -EINVAL
  * indicates that the waited task was either synchronous or detached. */
-int starpu_wait_task(struct starpu_task *task);
+int starpu_task_wait(struct starpu_task *task);
 
 /* This function waits until all the tasks that were already submitted have
  * been executed. */

src/core/task.c

@@ -109,7 +109,7 @@ void starpu_task_destroy(struct starpu_task *task)
 	free(task);
 }
 
-int starpu_wait_task(struct starpu_task *task)
+int starpu_task_wait(struct starpu_task *task)
 {
 	STARPU_ASSERT(task);
 

src/util/execute_on_all.c

@@ -80,7 +80,7 @@ void starpu_execute_on_each_worker(void (*func)(void *), void *arg, uint32_t whe
 	{
 		if (tasks[worker])
 		{
-			starpu_wait_task(tasks[worker]);
+			starpu_task_wait(tasks[worker]);
 			starpu_task_destroy(tasks[worker]);
 		}
 	}

tests/Makefile.am

@@ -75,7 +75,7 @@ check_PROGRAMS += 				\
 	core/execute_on_a_specific_worker	\
 	core/multithreaded			\
 	core/starpu_wait_all_tasks		\
-	core/starpu_wait_task			\
+	core/starpu_task_wait			\
 	core/static_restartable			\
 	core/static_restartable_using_initializer\
 	core/static_restartable_tag		\
@@ -127,8 +127,8 @@ core_multithreaded_SOURCES =			\
 core_starpu_wait_all_tasks_SOURCES =		\
 	core/starpu_wait_all_tasks.c
 
-core_starpu_wait_task_SOURCES =			\
-	core/starpu_wait_task.c
+core_starpu_task_wait_SOURCES =			\
+	core/starpu_task_wait.c
 
 core_static_restartable_SOURCES =		\
 	core/static_restartable.c

tests/core/declare_deps_after_submission.c

@@ -76,10 +76,10 @@ int main(int argc, char **argv)
 		ret = starpu_submit_task(taskB);
 		STARPU_ASSERT(!ret);
 
-		ret = starpu_wait_task(taskB);
+		ret = starpu_task_wait(taskB);
 		STARPU_ASSERT(!ret);
 
-		ret = starpu_wait_task(taskA);
+		ret = starpu_task_wait(taskA);
 		STARPU_ASSERT(!ret);
 	}
 

tests/core/empty_task.c

@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 		int ret = starpu_submit_task(task);
 		STARPU_ASSERT(!ret);
 
-		starpu_wait_task(task);
+		starpu_task_wait(task);
 	}
 
 	gettimeofday(&end, NULL);

tests/core/starpu_wait_task.c

@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 		int ret = starpu_submit_task(task);
 		STARPU_ASSERT(!ret);
 
-		ret = starpu_wait_task(task);
+		ret = starpu_task_wait(task);
 		STARPU_ASSERT(!ret);
 
 		starpu_task_destroy(task);

tests/core/static_restartable.c

@@ -74,7 +74,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < ntasks; i++)
 	{
 		starpu_submit_task(&task);
-		starpu_wait_task(&task);
+		starpu_task_wait(&task);
 	}
 
 	gettimeofday(&end, NULL);

tests/core/static_restartable_using_initializer.c

@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < ntasks; i++)
 	{
 		starpu_submit_task(&task);
-		starpu_wait_task(&task);
+		starpu_task_wait(&task);
 	}
 
 	gettimeofday(&end, NULL);

tests/core/task_wait_api.c

@@ -62,7 +62,7 @@ int main(int argc, char **argv)
 	starpu_submit_task(taskB);
 	starpu_submit_task(taskA);
 
-	starpu_wait_task(taskB);
+	starpu_task_wait(taskB);
 
 	fprintf(stderr, "{ C, D, E, F } -> { G }\n");
 
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
 	starpu_submit_task(taskE);
 	starpu_submit_task(taskF);
 
-	starpu_wait_task(taskG);
+	starpu_task_wait(taskG);
 
 	fprintf(stderr, "{ H, I } -> { J, K, L }\n");
 	
@@ -107,9 +107,9 @@ int main(int argc, char **argv)
 	starpu_submit_task(taskK);
 	starpu_submit_task(taskL);
 
-	starpu_wait_task(taskJ);
-	starpu_wait_task(taskK);
-	starpu_wait_task(taskL);
+	starpu_task_wait(taskJ);
+	starpu_task_wait(taskK);
+	starpu_task_wait(taskL);
 
 	starpu_shutdown();
 

tests/datawizard/write_only_tmp_buffer.c

@@ -103,7 +103,7 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV)
 			goto enodev;
 
-	ret = starpu_wait_task(task);
+	ret = starpu_task_wait(task);
 	if (ret)
 		exit(-1);
 
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV)
 			goto enodev;
 
-	ret = starpu_wait_task(task);
+	ret = starpu_task_wait(task);
 	if (ret)
 		exit(-1);