Solve warning (multi def, non voi fn reach end..)

mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint.c

@@ -29,7 +29,6 @@
 #define MAX_CP_TEMPLATE_NUMBER 32 // Arbitrary limit
 
 starpu_pthread_mutex_t           cp_lib_mutex;
-int                              my_rank;
 
 
 extern struct _starpu_mpi_req* _starpu_mpi_isend_cache_aware(starpu_data_handle_t data_handle, int dest, starpu_mpi_tag_t data_tag, MPI_Comm comm, unsigned detached, unsigned sync, int prio, void (*callback)(void *), void *_arg, int sequential_consistency, int* cache_flag);
@@ -201,7 +200,7 @@ int starpu_mpi_submit_checkpoint_template(starpu_mpi_checkpoint_template_t cp_te
 			case STARPU_R:
 				handle = (starpu_data_handle_t)item->ptr;
 				mpi_data = _starpu_mpi_data_get(handle);
-				if (starpu_mpi_data_get_rank(handle)==my_rank)
+				if (starpu_mpi_data_get_rank(handle)==_my_rank)
 				{
 					if (!mpi_data->modified)
 					{

mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint.h

@@ -26,6 +26,8 @@ extern "C"
 {
 #endif
 
+extern int _my_rank;
+
 struct _starpu_mpi_cp_ack_msg
 {
 	int checkpoint_id;

mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint_template.c

@@ -32,7 +32,6 @@ starpu_pthread_mutex_t           cp_template_mutex;
 starpu_pthread_mutex_t           current_instance_mutex;
 starpu_mpi_checkpoint_template_t cp_template_array[MAX_CP_TEMPLATE_NUMBER];
 int                              cp_template_array_size = 0;
-int                              my_rank;
 int                              comm_size;
 int                              current_instance;
 
@@ -62,7 +61,7 @@ int get_current_instance()
 void checkpoint_template_lib_init(void) {
 	starpu_pthread_mutex_init(&current_instance_mutex, NULL);
 	starpu_pthread_mutex_init(&cp_template_mutex, NULL);
-	starpu_mpi_comm_rank(MPI_COMM_WORLD, &my_rank);
+	starpu_mpi_comm_rank(MPI_COMM_WORLD, &_my_rank);
 	starpu_mpi_comm_size(MPI_COMM_WORLD, &comm_size);
 	current_instance = 0;
 #ifdef STARPU_MPI_VERBOSE
@@ -119,11 +118,11 @@ int _starpu_mpi_checkpoint_template_add_entry(starpu_mpi_checkpoint_template_t c
 			count        = 1;
 			backupped_by = va_arg(varg_list, int);
 			data_rank    = starpu_mpi_data_get_rank((starpu_data_handle_t)ptr);
-			if (my_rank==data_rank)
+			if (_my_rank==data_rank)
 			{
 				return _starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, backupped_by, -1, -1);
 			}
-			else if(my_rank == backupped_by)
+			else if(_my_rank == backupped_by)
 			{
 				return _starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, -1, data_rank, -1);
 			}
@@ -139,18 +138,18 @@ int _starpu_mpi_checkpoint_template_add_entry(starpu_mpi_checkpoint_template_t c
 			tag       = va_arg(varg_list, starpu_mpi_tag_t);
 			_backup_of = va_arg(varg_list, backup_of_fn);
 			/* I register the backup that will save this data */
-			_starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, _backup_of(my_rank), -1, tag);
-			for (int i=0 ; i<my_rank ; i++)
+			_starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, _backup_of(_my_rank), -1, tag);
+			for (int i=0 ; i<_my_rank ; i++)
 			{
-				if (_backup_of(i) == my_rank)
+				if (_backup_of(i) == _my_rank)
 				{
 					/* I'm the back up of someone else for this data, I have to remember it */
 					_starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, -1, i, tag);
 				}
 			}
-			for (int i=my_rank+1 ; i<comm_size ; i++)
+			for (int i=_my_rank+1 ; i<comm_size ; i++)
 			{
-				if (_backup_of(i) == my_rank)
+				if (_backup_of(i) == _my_rank)
 				{
 					/* I'm the back up of someone else for this data, I have to remember it */
 					_starpu_mpi_checkpoint_template_add_data(cp_template, arg_type, ptr, count, -1, i, tag);

mpi/src/mpi_failure_tolerance/starpu_mpi_checkpoint_template.h

@@ -34,6 +34,7 @@ extern "C"
 
 extern starpu_pthread_mutex_t           cp_template_mutex;
 extern int                              cp_template_array_size;
+
 extern starpu_mpi_checkpoint_template_t cp_template_array[MAX_CP_TEMPLATE_NUMBER];
 
 int increment_current_instance();

mpi/src/mpi_failure_tolerance/starpu_mpi_ft.c

@@ -22,12 +22,12 @@
 
 
 starpu_pthread_mutex_t           ft_mutex;
-int                              my_rank;
+int                              _my_rank;
 
 int starpu_mpi_ft_turn_on(void)
 {
 	starpu_pthread_mutex_init(&ft_mutex, NULL);
-	starpu_mpi_comm_rank(MPI_COMM_WORLD, &my_rank); //TODO: check compatibility with several Comms behaviour
+	starpu_mpi_comm_rank(MPI_COMM_WORLD, &_my_rank); //TODO: check compatibility with several Comms behaviour
 	starpu_mpi_ft_service_lib_init();
 	checkpoint_template_lib_init();
 	_starpu_mpi_checkpoint_tracker_init();

mpi/src/mpi_failure_tolerance/starpu_mpi_ft_stats.h

@@ -44,7 +44,7 @@ extern size_t ft_service_msgs_received_total_size;
 
 extern struct size_sample_list cp_data_in_memory_list; //over time
 extern size_t cp_data_in_memory_size_total;
-size_t cp_data_in_memory_size_max_at_t;
+extern size_t cp_data_in_memory_size_max_at_t;
 
 
 static inline void stat_init();

mpi/src/starpu_mpi_cache.c

@@ -205,6 +205,7 @@ int starpu_mpi_cache_set_ft_induced_cache_receive(starpu_data_handle_t data_hand
 {
 	struct _starpu_mpi_data *mpi_data = data_handle->mpi_data;
 	mpi_data->ft_induced_cache_received = 1;
+	return 1;
 }
 
 int starpu_mpi_cached_receive_set(starpu_data_handle_t data_handle)