소스 검색

revert 9453 and rename function starpu_get_data_handle_from_tag to starpu_data_get_data_handle_from_tag

Nathalie Furmento 12 년 전
부모
커밋
4f3d19a92b
4개의 변경된 파일9개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 0
      doc/chapters/api.texi
  2. 1 1
      include/starpu_data.h
  3. 1 1
      mpi/src/starpu_mpi.c
  4. 3 3
      src/datawizard/interfaces/data_interface.c

+ 4 - 0
doc/chapters/api.texi

@@ -3405,6 +3405,10 @@ to it.
 Returns the last value set by @code{starpu_data_set_rank}.
 @end deftypefun
 
+@deftypefun starpu_data_handle_t starpu_data_get_data_handle_from_tag (int @var{tag})
+Returns the data handle associated to the MPI tag, or NULL if there is not.
+@end deftypefun
+
 @defmac STARPU_EXECUTE_ON_NODE
 this macro is used when calling @code{starpu_mpi_insert_task}, and
 must be followed by a integer value which specified the node on which

+ 1 - 1
include/starpu_data.h

@@ -133,7 +133,7 @@ int starpu_data_get_rank(starpu_data_handle_t handle);
 
 int starpu_data_set_tag(starpu_data_handle_t handle, int tag);
 int starpu_data_get_tag(starpu_data_handle_t handle);
-starpu_data_handle_t starpu_get_data_handle_from_tag(int tag);
+starpu_data_handle_t starpu_data_get_data_handle_from_tag(int tag);
 struct starpu_data_interface_ops* starpu_handle_get_interface(starpu_data_handle_t handle);
 
 unsigned starpu_data_test_if_allocated_on_node(starpu_data_handle_t handle, unsigned memory_node);

+ 1 - 1
mpi/src/starpu_mpi.c

@@ -1127,7 +1127,7 @@ static void *_starpu_mpi_progress_thread_func(void *arg)
 
 					while(!(data_handle))
 					{
-						data_handle = starpu_get_data_handle_from_tag(recv_env->mpi_tag);
+						data_handle = starpu_data_get_data_handle_from_tag(recv_env->mpi_tag);
 					}
 					STARPU_ASSERT(data_handle);
 

+ 3 - 3
src/datawizard/interfaces/data_interface.c

@@ -363,7 +363,7 @@ int starpu_data_get_tag(starpu_data_handle_t handle)
 	return handle->tag;
 }
 
-starpu_data_handle_t starpu_get_data_handle_from_tag(int tag)
+starpu_data_handle_t starpu_data_get_data_handle_from_tag(int tag)
 {
 	struct handle_tag_entry *ret;
 
@@ -386,8 +386,8 @@ int starpu_data_set_tag(starpu_data_handle_t handle, int tag)
 	struct handle_tag_entry *entry;
 	entry = (struct handle_tag_entry *) malloc(sizeof(*entry));
 	STARPU_ASSERT(entry != NULL);
-	
-	STARPU_ASSERT_MSG(!(starpu_get_data_handle_from_tag(tag)),"A data handle with tag %d had already been registered.\n",tag);
+
+	STARPU_ASSERT_MSG(!(starpu_data_get_data_handle_from_tag(tag)),"A data handle with tag %d had already been registered.\n",tag);
 
 	entry->tag = tag;
 	entry->handle = handle;