rename smx_action_t to smx_synchro_t

[simgrid.git] / src / smpi / private.h

diff --git a/src/smpi/private.h b/src/smpi/private.h
index d799e81..6339cfe 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -102,7 +102,7 @@ typedef struct s_smpi_mpi_request {
   int truncated;
   size_t real_size;
   MPI_Comm comm;
-  smx_action_t action;
+  smx_synchro_t action;
   unsigned flags;
   int detached;
   MPI_Request detached_sender;
@@ -114,11 +114,11 @@ typedef struct s_smpi_mpi_request {
 #endif
 } s_smpi_mpi_request_t;
 
-typedef struct s_smpi_mpi_key_elem {
-  MPI_Copy_function* copy_fn;
-  MPI_Delete_function* delete_fn;
-} s_smpi_mpi_key_elem_t; 
-typedef struct s_smpi_mpi_key_elem *smpi_key_elem;
+typedef struct s_smpi_mpi_comm_key_elem {
+  MPI_Comm_copy_attr_function* copy_fn;
+  MPI_Comm_delete_attr_function* delete_fn;
+} s_smpi_mpi_comm_key_elem_t; 
+typedef struct s_smpi_mpi_comm_key_elem *smpi_comm_key_elem;
 
 typedef struct s_smpi_mpi_type_key_elem {
   MPI_Type_copy_attr_function* copy_fn;
@@ -185,10 +185,10 @@ int smpi_process_get_replaying(void);
 void smpi_deployment_register_process(const char* instance_id, int rank, int index, MPI_Comm**, xbt_bar_t*);
 void smpi_deployment_cleanup_instances(void);
 
-void smpi_comm_copy_buffer_callback(smx_action_t comm,
+void smpi_comm_copy_buffer_callback(smx_synchro_t comm,
                                            void *buff, size_t buff_size);
 
-void smpi_comm_null_copy_buffer_callback(smx_action_t comm,
+void smpi_comm_null_copy_buffer_callback(smx_synchro_t comm,
                                            void *buff, size_t buff_size);
 
 void print_request(const char *message, MPI_Request request);
@@ -417,11 +417,11 @@ int smpi_coll_basic_alltoallv(void *sendbuf, int *sendcounts,
                               int *recvdisps, MPI_Datatype recvtype,
                               MPI_Comm comm);
                               
-int smpi_keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state);
-int smpi_keyval_free(int* keyval);
-int smpi_attr_delete(MPI_Comm comm, int keyval);
-int smpi_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag);
-int smpi_attr_put(MPI_Comm comm, int keyval, void* attr_value);
+int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, void* extra_state);
+int smpi_comm_keyval_free(int* keyval);
+int smpi_comm_attr_delete(MPI_Comm comm, int keyval);
+int smpi_comm_attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag);
+int smpi_comm_attr_put(MPI_Comm comm, int keyval, void* attr_value);
 int smpi_type_attr_delete(MPI_Datatype type, int keyval);
 int smpi_type_attr_get(MPI_Datatype type, int keyval, void* attr_value, int* flag);
 int smpi_type_attr_put(MPI_Datatype type, int keyval, void* attr_value);
@@ -435,7 +435,9 @@ extern char* start_data_exe; //start of the data+bss segment of the executable
 extern int size_data_exe; //size of the data+bss segment of the executable
 
 
-void smpi_switch_data_segment(int);
+void smpi_switch_data_segment(int dest);
+void smpi_really_switch_data_segment(int dest);
+
 void smpi_get_executable_global_size(void);
 void smpi_initialize_global_memory_segments(void);
 void smpi_destroy_global_memory_segments(void);