mpi/src: rename cache functions

mpi/src/starpu_mpi_cache.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 2012, 2013, 2014, 2015  Centre National de la Recherche Scientifique
  * Copyright (C) 2011-2015  Université de Bordeaux
  * Copyright (C) 2014 INRIA
  *
@@ -123,7 +123,7 @@ void _starpu_mpi_cache_free(int world_size)
 	_starpu_mpi_cache_stats_free();
 }
 
-void _starpu_mpi_cache_flush_sent(MPI_Comm comm, starpu_data_handle_t data)
+void _starpu_mpi_cache_sent_data_clear(MPI_Comm comm, starpu_data_handle_t data)
 {
 	int n, size;
 	starpu_mpi_comm_size(comm, &size);
@@ -144,7 +144,7 @@ void _starpu_mpi_cache_flush_sent(MPI_Comm comm, starpu_data_handle_t data)
 	}
 }
 
-void _starpu_mpi_cache_flush_recv(starpu_data_handle_t data, int me)
+void _starpu_mpi_cache_received_data_clear(starpu_data_handle_t data, int me)
 {
 	int mpi_rank = starpu_data_get_rank(data);
 	struct _starpu_data_entry *already_received;
@@ -244,7 +244,7 @@ void starpu_mpi_cache_flush(MPI_Comm comm, starpu_data_handle_t data_handle)
 		starpu_data_invalidate_submit(data_handle);
 }
 
-void *_starpu_mpi_already_received(int src, starpu_data_handle_t data, int mpi_rank)
+void *_starpu_mpi_cache_received_data_set(int src, starpu_data_handle_t data, int mpi_rank)
 {
 	struct _starpu_data_entry *already_received;
 
@@ -267,7 +267,7 @@ void *_starpu_mpi_already_received(int src, starpu_data_handle_t data, int mpi_r
 	return already_received;
 }
 
-void *_starpu_mpi_already_sent(starpu_data_handle_t data, int dest)
+void *_starpu_mpi_cache_sent_data_set(starpu_data_handle_t data, int dest)
 {
 	struct _starpu_data_entry *already_sent;
 

mpi/src/starpu_mpi_cache.h

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 2012, 2013, 2014, 2015  Centre National de la Recherche Scientifique
  * Copyright (C) 2011-2014  Université de Bordeaux
  * Copyright (C) 2014 INRIA
  *
@@ -29,10 +29,20 @@ extern "C" {
 
 extern int _starpu_cache_enabled;
 void _starpu_mpi_cache_init(MPI_Comm comm);
-void *_starpu_mpi_already_received(int src, starpu_data_handle_t data, int mpi_rank);
-void *_starpu_mpi_already_sent(starpu_data_handle_t data, int dest);
-void _starpu_mpi_cache_flush_sent(MPI_Comm comm, starpu_data_handle_t data);
-void _starpu_mpi_cache_flush_recv(starpu_data_handle_t data, int me);
+
+/*
+ * If the data is already available in the cache, return a pointer to the data
+ * If the data is NOT available in the cache, add it to the cache and return NULL
+ */
+void *_starpu_mpi_cache_received_data_set(int src, starpu_data_handle_t data, int mpi_rank);
+void _starpu_mpi_cache_received_data_clear(starpu_data_handle_t data, int me);
+
+/*
+ * If the data is already available in the cache, return a pointer to the data
+ * If the data is NOT available in the cache, add it to the cache and return NULL
+ */
+void *_starpu_mpi_cache_sent_data_set(starpu_data_handle_t data, int dest);
+void _starpu_mpi_cache_sent_data_clear(MPI_Comm comm, starpu_data_handle_t data);
 
 #ifdef __cplusplus
 }

mpi/src/starpu_mpi_task_insert.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2012, 2013, 2014  Centre National de la Recherche Scientifique
+ * Copyright (C) 2011, 2012, 2013, 2014, 2015  Centre National de la Recherche Scientifique
  * Copyright (C) 2011-2015  Université de Bordeaux
  * Copyright (C) 2014 INRIA
  *
@@ -117,20 +117,20 @@ void _starpu_mpi_exchange_data_before_execution(starpu_data_handle_t data, enum
 		if (do_execute && mpi_rank != me && mpi_rank != -1)
 		{
 			/* I will have to execute but I don't have the data, receive */
-			void *already_received = _starpu_mpi_already_received(me, data, mpi_rank);
+			void *already_received = _starpu_mpi_cache_received_data_set(me, data, mpi_rank);
 			if (already_received == NULL)
 			{
-				_STARPU_MPI_DEBUG(1, "Receive data %p from %d\n", data, mpi_rank);
+				_STARPU_MPI_DEBUG(1, "Receiving data %p from %d\n", data, mpi_rank);
 				starpu_mpi_irecv_detached(data, mpi_rank, data_tag, comm, NULL, NULL);
 			}
 		}
 		if (!do_execute && mpi_rank == me)
 		{
 			/* Somebody else will execute it, and I have the data, send it. */
-			void *already_sent = _starpu_mpi_already_sent(data, xrank);
+			void *already_sent = _starpu_mpi_cache_sent_data_set(data, xrank);
 			if (already_sent == NULL)
 			{
-				_STARPU_MPI_DEBUG(1, "Send data %p to %d\n", data, xrank);
+				_STARPU_MPI_DEBUG(1, "Sending data %p to %d\n", data, xrank);
 				_SEND_DATA(data, mode, xrank, data_tag, comm, NULL, NULL);
 			}
 		}
@@ -180,11 +180,11 @@ void _starpu_mpi_clear_data_after_execution(starpu_data_handle_t data, enum star
 			if (do_execute)
 			{
 				/* Note that all copies I've sent to neighbours are now invalid */
-				_starpu_mpi_cache_flush_sent(comm, data);
+				_starpu_mpi_cache_sent_data_clear(comm, data);
 			}
 			else
 			{
-				_starpu_mpi_cache_flush_recv(data, me);
+				_starpu_mpi_cache_received_data_clear(data, me);
 			}
 		}
 	}