Browse Source

mpi: followup to @22365: fix the use of uintptr_t for the return value of the progression thread

Nathalie Furmento 7 years ago
parent
commit
b52b2c01bf

+ 1 - 1
mpi/src/mpi/starpu_mpi_mpi.c

@@ -1615,7 +1615,7 @@ void _starpu_mpi_wait_for_initialization()
 }
 #endif
 
-void _starpu_mpi_progress_shutdown(uintptr_t *value)
+void _starpu_mpi_progress_shutdown(uintptr_t value)
 {
         STARPU_PTHREAD_MUTEX_LOCK(&progress_mutex);
         running = 0;

+ 1 - 1
mpi/src/nmad/starpu_mpi_nmad.c

@@ -752,7 +752,7 @@ int _starpu_mpi_progress_init(struct _starpu_mpi_argc_argv *argc_argv)
         return 0;
 }
 
-void _starpu_mpi_progress_shutdown(uintptr_t *value)
+void _starpu_mpi_progress_shutdown(uintptr_t value)
 {
 	/* kill the progression thread */
         STARPU_PTHREAD_MUTEX_LOCK(&progress_mutex);

+ 2 - 2
mpi/src/starpu_mpi_init.c

@@ -178,7 +178,7 @@ int starpu_mpi_initialize_extended(int *rank, int *world_size)
 
 int starpu_mpi_shutdown(void)
 {
-	int value;
+	uintptr_t value;
 	int rank, world_size;
 
 	/* We need to get the rank before calling MPI_Finalize to pass to _starpu_mpi_comm_amounts_display() */
@@ -186,7 +186,7 @@ int starpu_mpi_shutdown(void)
 	starpu_mpi_comm_size(MPI_COMM_WORLD, &world_size);
 
 	/* kill the progression thread */
-	_starpu_mpi_progress_shutdown((uintptr_t)&value);
+	_starpu_mpi_progress_shutdown(value);
 
 	_STARPU_MPI_TRACE_STOP(rank, world_size);
 

+ 1 - 1
mpi/src/starpu_mpi_private.h

@@ -319,7 +319,7 @@ struct _starpu_mpi_argc_argv
 	int world_size;
 };
 
-void _starpu_mpi_progress_shutdown(uintptr_t *value);
+void _starpu_mpi_progress_shutdown(uintptr_t value);
 int _starpu_mpi_progress_init(struct _starpu_mpi_argc_argv *argc_argv);
 #ifdef STARPU_SIMGRID
 void _starpu_mpi_wait_for_initialization();