nmad: rename some functions

To avoid any confusion about what they do: with nmad, if datatype is not
registered (unknown), size of the datatype is sent in the same request
as the data.

mpi/src/nmad/starpu_mpi_nmad.c

@@ -93,7 +93,7 @@ void _starpu_mpi_req_willpost(struct _starpu_mpi_req *req STARPU_ATTRIBUTE_UNUSE
 /*                                                      */
 /********************************************************/
 
-static void _starpu_mpi_isend_data_func(struct _starpu_mpi_req *req)
+static void _starpu_mpi_isend_known_datatype(struct _starpu_mpi_req *req)
 {
 	_STARPU_MPI_LOG_IN();
 
@@ -131,8 +131,10 @@ static void _starpu_mpi_isend_data_func(struct _starpu_mpi_req *req)
 	_STARPU_MPI_LOG_OUT();
 }
 
-void _starpu_mpi_isend_size_func(struct _starpu_mpi_req *req)
+void _starpu_mpi_isend_func(struct _starpu_mpi_req *req)
 {
+	_STARPU_MPI_LOG_IN();
+
 	_starpu_mpi_datatype_allocate(req->data_handle, req);
 
 	if (req->registered_datatype == 1)
@@ -140,12 +142,14 @@ void _starpu_mpi_isend_size_func(struct _starpu_mpi_req *req)
 		req->count = 1;
 		req->ptr = starpu_data_handle_to_pointer(req->data_handle, req->node);
 
-		_starpu_mpi_isend_data_func(req);
+		_starpu_mpi_isend_known_datatype(req);
 	}
 	else
 	{
 		_starpu_mpi_isend_unknown_datatype(req);
 	}
+
+	_STARPU_MPI_LOG_OUT();
 }
 
 /********************************************************/
@@ -154,7 +158,7 @@ void _starpu_mpi_isend_size_func(struct _starpu_mpi_req *req)
 /*                                                      */
 /********************************************************/
 
-static void _starpu_mpi_irecv_data_func(struct _starpu_mpi_req *req)
+static void _starpu_mpi_irecv_known_datatype(struct _starpu_mpi_req *req)
 {
 	_STARPU_MPI_LOG_IN();
 
@@ -177,7 +181,7 @@ static void _starpu_mpi_irecv_data_func(struct _starpu_mpi_req *req)
 	_STARPU_MPI_LOG_OUT();
 }
 
-void _starpu_mpi_irecv_size_func(struct _starpu_mpi_req *req)
+void _starpu_mpi_irecv_func(struct _starpu_mpi_req *req)
 {
 	_STARPU_MPI_LOG_IN();
 
@@ -186,13 +190,14 @@ void _starpu_mpi_irecv_size_func(struct _starpu_mpi_req *req)
 	{
 		req->count = 1;
 		req->ptr = starpu_data_handle_to_pointer(req->data_handle, req->node);
-		_starpu_mpi_irecv_data_func(req);
+		_starpu_mpi_irecv_known_datatype(req);
 	}
 	else
 	{
 		_starpu_mpi_irecv_unknown_datatype(req);
 	}
 
+	_STARPU_MPI_LOG_OUT();
 }
 
 /********************************************************/

mpi/src/nmad/starpu_mpi_nmad.h

@@ -44,8 +44,8 @@ int _starpu_mpi_wait_for_all(MPI_Comm comm);
 int _starpu_mpi_wait(starpu_mpi_req *public_req, MPI_Status *status);
 int _starpu_mpi_test(starpu_mpi_req *public_req, int *flag, MPI_Status *status);
 
-void _starpu_mpi_isend_size_func(struct _starpu_mpi_req *req);
-void _starpu_mpi_irecv_size_func(struct _starpu_mpi_req *req);
+void _starpu_mpi_isend_func(struct _starpu_mpi_req *req);
+void _starpu_mpi_irecv_func(struct _starpu_mpi_req *req);
 
 #ifdef __cplusplus
 }

mpi/src/nmad/starpu_mpi_nmad_backend.c

@@ -106,8 +106,8 @@ struct _starpu_mpi_backend _mpi_backend =
 	._starpu_mpi_backend_wait = _starpu_mpi_wait,
 	._starpu_mpi_backend_test = _starpu_mpi_test,
 
-	._starpu_mpi_backend_isend_size_func = _starpu_mpi_isend_size_func,
-	._starpu_mpi_backend_irecv_size_func = _starpu_mpi_irecv_size_func,
+	._starpu_mpi_backend_isend_size_func = _starpu_mpi_isend_func,
+	._starpu_mpi_backend_irecv_size_func = _starpu_mpi_irecv_func,
 };
 
 #endif /* STARPU_USE_MPI_NMAD*/