mpi: clean code

mpi/include/starpu_mpi.h

@@ -75,8 +75,6 @@ void starpu_mpi_comm_amounts_retrieve(size_t *comm_amounts);
 void starpu_mpi_cache_flush(MPI_Comm comm, starpu_data_handle_t data_handle);
 void starpu_mpi_cache_flush_all_data(MPI_Comm comm);
 
-starpu_data_handle_t starpu_mpi_get_data_from_sent_cache(int dst_node);
-
 int starpu_mpi_comm_size(MPI_Comm comm, int *size);
 int starpu_mpi_comm_rank(MPI_Comm comm, int *rank);
 int starpu_mpi_world_rank(void);
@@ -99,7 +97,6 @@ int starpu_mpi_data_get_tag(starpu_data_handle_t handle);
 #define starpu_data_get_rank starpu_mpi_data_get_rank
 #define starpu_data_get_tag starpu_mpi_data_get_tag
 
-starpu_data_handle_t starpu_mpi_data_get_data_handle_from_tag(int tag);
 void starpu_mpi_data_migrate(MPI_Comm comm, starpu_data_handle_t handle, int new_rank);
 
 #define STARPU_MPI_NODE_SELECTION_CURRENT_POLICY -1

mpi/src/load_balancer/policy/load_heat_propagation.c

@@ -16,6 +16,7 @@
  */
 
 #include <starpu_mpi.h>
+#include <starpu_mpi_tag.h>
 #include <common/uthash.h>
 #include <common/utils.h>
 #include <math.h>
@@ -251,7 +252,7 @@ static void update_data_ranks()
 
 			for (j = 0; j < ndata_to_update; j++)
 			{
-				starpu_data_handle_t handle = starpu_mpi_data_get_data_handle_from_tag((data_movements_get_tags_table(data_movements_handles[i]))[j]);
+				starpu_data_handle_t handle = _starpu_mpi_data_get_data_handle_from_tag((data_movements_get_tags_table(data_movements_handles[i]))[j]);
 				STARPU_ASSERT(handle);
 				int dst_rank = (data_movements_get_ranks_table(data_movements_handles[i]))[j];
 
@@ -516,7 +517,7 @@ static void move_back_data()
 
 			for (j = 0; j < ndata_to_update; j++)
 			{
-				starpu_data_handle_t handle = starpu_mpi_data_get_data_handle_from_tag((data_movements_get_tags_table(data_movements_handles[i]))[j]);
+				starpu_data_handle_t handle = _starpu_mpi_data_get_data_handle_from_tag((data_movements_get_tags_table(data_movements_handles[i]))[j]);
 				STARPU_ASSERT(handle);
 
 				int dst_rank = (data_movements_get_ranks_table(data_movements_handles[i]))[j];

mpi/src/starpu_mpi.c

@@ -1306,7 +1306,7 @@ static void _starpu_mpi_receive_early_data(struct _starpu_mpi_envelope *envelope
 
 	starpu_data_handle_t data_handle = NULL;
 	STARPU_PTHREAD_MUTEX_UNLOCK(&mutex);
-	data_handle = starpu_mpi_data_get_data_handle_from_tag(envelope->data_tag);
+	data_handle = _starpu_mpi_data_get_data_handle_from_tag(envelope->data_tag);
 	STARPU_PTHREAD_MUTEX_LOCK(&mutex);
 
 	if (data_handle && starpu_data_get_interface_id(data_handle) < STARPU_MAX_INTERFACE_ID)
@@ -1767,7 +1767,7 @@ int _starpu_mpi_initialize(int *argc, char ***argv, int initialize_mpi, MPI_Comm
  * create MSG processes to run application's main */
 int _starpu_mpi_simgrid_init(int argc, char *argv[])
 {
-	return _starpu_mpi_initialize(&argc, &argv, 1, MPI_COMM_WORLD, NULL);
+	return _starpu_mpi_initialize(&argc, &argv, 1, MPI_COMM_WORLD);
 }
 #endif
 

mpi/src/starpu_mpi_cache.c

@@ -38,23 +38,6 @@ int _starpu_cache_enabled=1;
 MPI_Comm _starpu_cache_comm;
 int _starpu_cache_comm_size;
 
-starpu_data_handle_t starpu_mpi_get_data_from_sent_cache(int dst_node)
-{
-    starpu_data_handle_t data = NULL;
-
-    STARPU_PTHREAD_MUTEX_LOCK(&_cache_received_mutex[dst_node]);
-    struct _starpu_data_entry *entry = _cache_received_data[dst_node];
-    while (entry && entry->hh.next)
-    {
-        entry = entry->hh.next;
-    }
-    if (entry)
-        data = entry->data;
-    STARPU_PTHREAD_MUTEX_UNLOCK(&_cache_received_mutex[dst_node]);
-
-    return data;
-}
-
 int starpu_mpi_cache_is_enabled()
 {
 	return _starpu_cache_enabled==1;

mpi/src/starpu_mpi_tag.c

@@ -55,7 +55,7 @@ void _starpu_mpi_tag_free(void)
 	registered_tag_handles = NULL;
 }
 
-starpu_data_handle_t starpu_mpi_data_get_data_handle_from_tag(int tag)
+starpu_data_handle_t _starpu_mpi_data_get_data_handle_from_tag(int tag)
 {
 	struct handle_tag_entry *ret;
 
@@ -78,8 +78,8 @@ void _starpu_mpi_data_register_tag(starpu_data_handle_t handle, int tag)
 	struct handle_tag_entry *entry;
 	_STARPU_MPI_MALLOC(entry, sizeof(*entry));
 
-	STARPU_ASSERT_MSG(!(starpu_mpi_data_get_data_handle_from_tag(tag)),
-			  "There is already a data handle %p registered with the tag %d\n", starpu_mpi_data_get_data_handle_from_tag(tag), tag);
+	STARPU_ASSERT_MSG(!(_starpu_mpi_data_get_data_handle_from_tag(tag)),
+			  "There is already a data handle %p registered with the tag %d\n", _starpu_mpi_data_get_data_handle_from_tag(tag), tag);
 
 	_STARPU_MPI_DEBUG(42, "Adding handle %p with tag %d in hashtable\n", handle, tag);
 

mpi/src/starpu_mpi_tag.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2015, 2017  CNRS
+ * Copyright (C) 2015  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -29,6 +29,7 @@ void _starpu_mpi_tag_init(void);
 void _starpu_mpi_tag_free(void);
 void _starpu_mpi_data_register_tag(starpu_data_handle_t handle, int tag);
 int _starpu_mpi_data_release_tag(starpu_data_handle_t handle);
+starpu_data_handle_t _starpu_mpi_data_get_data_handle_from_tag(int tag);
 
 #ifdef __cplusplus
 }