cleanup, remove some useless functions

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

diff --git a/src/smpi/private.h b/src/smpi/private.h
index 3757ead..659424d 100644 (file)
--- a/src/smpi/private.h
+++ b/src/smpi/private.h
@@ -58,6 +58,7 @@ typedef struct s_smpi_mpi_datatype{
   MPI_Aint lb;
   MPI_Aint ub;
   int flags;
+  xbt_dict_t attributes;
   /* this let us know how to serialize and unserialize*/
   void *substruct;
   int in_use;
@@ -113,11 +114,17 @@ 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;
+  MPI_Type_delete_attr_function* delete_fn;
+} s_smpi_mpi_type_key_elem_t; 
+typedef struct s_smpi_mpi_type_key_elem *smpi_type_key_elem;
 
 void smpi_process_destroy(void);
 void smpi_process_finalize(void);
@@ -196,7 +203,7 @@ int is_datatype_valid(MPI_Datatype datatype);
 size_t smpi_datatype_size(MPI_Datatype datatype);
 MPI_Aint smpi_datatype_lb(MPI_Datatype datatype);
 MPI_Aint smpi_datatype_ub(MPI_Datatype datatype);
-MPI_Datatype smpi_datatype_dup(MPI_Datatype datatype);
+int smpi_datatype_dup(MPI_Datatype datatype, MPI_Datatype* new_t);
 int smpi_datatype_extent(MPI_Datatype datatype, MPI_Aint * lb,
                          MPI_Aint * extent);
 MPI_Aint smpi_datatype_get_extent(MPI_Datatype datatype);
@@ -256,7 +263,7 @@ int smpi_comm_size(MPI_Comm comm);
 void smpi_comm_get_name(MPI_Comm comm, char* name, int* len);
 int smpi_comm_rank(MPI_Comm comm);
 MPI_Comm smpi_comm_split(MPI_Comm comm, int color, int key);
-MPI_Comm smpi_comm_dup(MPI_Comm comm);
+int smpi_comm_dup(MPI_Comm comm, MPI_Comm* newcomm);
 void smpi_comm_use(MPI_Comm comm);
 void smpi_comm_unuse(MPI_Comm comm);
 void smpi_comm_set_leaders_comm(MPI_Comm comm, MPI_Comm leaders);
@@ -410,13 +417,16 @@ 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);
+int smpi_type_keyval_create(MPI_Type_copy_attr_function* copy_fn, MPI_Type_delete_attr_function* delete_fn, int* keyval, void* extra_state);
+int smpi_type_keyval_free(int* keyval);
 // utilities
 extern double smpi_cpu_threshold;
 extern double smpi_running_power;