X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/819fb3779ffea39dd1f29a54f9f63b6c4bc2f909..84165e6544e93473e42e929e2e34e1bf2550468f:/include/smpi/smpi.h

diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h
index 0d2a1b4568..be7722065c 100644
--- a/include/smpi/smpi.h
+++ b/include/smpi/smpi.h
@@ -48,27 +48,82 @@ SG_BEGIN_DECL()
 #define MPI_IN_PLACE (void *)-222
 
 // errorcodes
-#define MPI_SUCCESS       0
-#define MPI_ERR_COMM      1
-#define MPI_ERR_ARG       2
-#define MPI_ERR_TYPE      3
-#define MPI_ERR_REQUEST   4
-#define MPI_ERR_INTERN    5
-#define MPI_ERR_COUNT     6
-#define MPI_ERR_RANK      7
-#define MPI_ERR_TAG       8
-#define MPI_ERR_TRUNCATE  9
-#define MPI_ERR_GROUP     10
-#define MPI_ERR_OP        11
-#define MPI_ERR_OTHER     12
-#define MPI_ERR_IN_STATUS 13
-#define MPI_ERR_PENDING   14
-#define MPI_ERR_BUFFER    15
-#define MPI_ERR_NAME      16
-#define MPI_ERR_DIMS      17
-#define MPI_ERR_TOPOLOGY  18
-#define MPI_ERR_NO_MEM    19
-#define MPI_ERR_WIN       20
+#define MPI_SUCCESS                    0
+#define MPI_ERR_COMM                   1
+#define MPI_ERR_ARG                    2
+#define MPI_ERR_TYPE                   3
+#define MPI_ERR_REQUEST                4
+#define MPI_ERR_INTERN                 5
+#define MPI_ERR_COUNT                  6
+#define MPI_ERR_RANK                   7
+#define MPI_ERR_TAG                    8
+#define MPI_ERR_TRUNCATE               9
+#define MPI_ERR_GROUP                 10
+#define MPI_ERR_OP                    11
+#define MPI_ERR_OTHER                 12
+#define MPI_ERR_IN_STATUS             13
+#define MPI_ERR_PENDING               14
+#define MPI_ERR_BUFFER                15
+#define MPI_ERR_NAME                  16
+#define MPI_ERR_DIMS                  17
+#define MPI_ERR_TOPOLOGY              18
+#define MPI_ERR_NO_MEM                19
+#define MPI_ERR_WIN                   20
+#define MPI_ERR_INFO_VALUE            21
+#define MPI_ERR_INFO_KEY              22
+#define MPI_ERR_INFO_NOKEY            23
+#define MPI_ERR_ROOT                  24
+#define MPI_ERR_UNKNOWN               25
+#define MPI_ERR_KEYVAL                26
+#define MPI_ERR_BASE                  27
+#define MPI_ERR_SPAWN                 28
+#define MPI_ERR_PORT                  29
+#define MPI_ERR_SERVICE               30
+#define MPI_ERR_SIZE                  31
+#define MPI_ERR_DISP                  32
+#define MPI_ERR_INFO                  33
+#define MPI_ERR_LOCKTYPE              34
+#define MPI_ERR_ASSERT                35
+#define MPI_RMA_CONFLICT              36
+#define MPI_RMA_SYNC                  37
+#define MPI_ERR_FILE                  38
+#define MPI_ERR_NOT_SAME              39
+#define MPI_ERR_AMODE                 40
+#define MPI_ERR_UNSUPPORTED_DATAREP   41
+#define MPI_ERR_UNSUPPORTED_OPERATION 42
+#define MPI_ERR_NO_SUCH_FILE          43
+#define MPI_ERR_FILE_EXISTS           44
+#define MPI_ERR_BAD_FILE              45
+#define MPI_ERR_ACCESS                46
+#define MPI_ERR_NO_SPACE              47
+#define MPI_ERR_QUOTA                 48
+#define MPI_ERR_READ_ONLY             49
+#define MPI_ERR_FILE_IN_USE           50
+#define MPI_ERR_DUP_DATAREP           51
+#define MPI_ERR_CONVERSION            52
+#define MPI_ERR_IO                    53
+#define MPI_ERR_RMA_ATTACH            54
+#define MPI_ERR_RMA_CONFLICT          55
+#define MPI_ERR_RMA_RANGE             56
+#define MPI_ERR_RMA_SHARED            57
+#define MPI_ERR_RMA_SYNC              58
+#define MPI_ERR_RMA_FLAVOR            59
+#define MPI_T_ERR_CANNOT_INIT         60
+#define MPI_T_ERR_NOT_INITIALIZED     61
+#define MPI_T_ERR_MEMORY              62
+#define MPI_T_ERR_INVALID_INDEX       63
+#define MPI_T_ERR_INVALID_ITEM        64
+#define MPI_T_ERR_INVALID_SESSION     65
+#define MPI_T_ERR_INVALID_HANDLE      66
+#define MPI_T_ERR_OUT_OF_HANDLES      67
+#define MPI_T_ERR_OUT_OF_SESSIONS     68
+#define MPI_T_ERR_CVAR_SET_NOT_NOW    69
+#define MPI_T_ERR_CVAR_SET_NEVER      70
+#define MPI_T_ERR_PVAR_NO_WRITE       71
+#define MPI_T_ERR_PVAR_NO_STARTSTOP   72
+#define MPI_T_ERR_PVAR_NO_ATOMIC      73
+
+
 #define MPI_ERRCODES_IGNORE (int *)0
 #define MPI_IDENT     0
 #define MPI_SIMILAR   1
@@ -111,7 +166,7 @@ SG_BEGIN_DECL()
 #define MPI_TYPECLASS_INTEGER 1
 #define MPI_TYPECLASS_COMPLEX 2
 #define MPI_ROOT 0
-#define MPI_INFO_NULL -1
+#define MPI_INFO_NULL NULL
 #define MPI_COMM_TYPE_SHARED    1
 #define MPI_WIN_NULL NULL
 
@@ -170,7 +225,8 @@ typedef struct {
 
 struct s_smpi_mpi_win;
 typedef struct s_smpi_mpi_win* MPI_Win;
-typedef int MPI_Info;
+struct s_smpi_mpi_info;
+typedef struct s_smpi_mpi_info *MPI_Info;
 
 #define MPI_STATUS_IGNORE ((MPI_Status*)NULL)
 #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL)
@@ -221,6 +277,7 @@ XBT_PUBLIC_DATA(MPI_Datatype) MPI_2FLOAT;
 XBT_PUBLIC_DATA(MPI_Datatype) MPI_2DOUBLE;
 XBT_PUBLIC_DATA(MPI_Datatype) MPI_2LONG;//only for compatibility with Fortran
 
+XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL;
 XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL4;
 XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL8;
 XBT_PUBLIC_DATA(MPI_Datatype) MPI_REAL16;
@@ -601,9 +658,8 @@ typedef void* MPI_Errhandler;
 typedef int MPI_Copy_function(MPI_Comm oldcomm, int keyval, void* extra_state, void* attribute_val_in,
                               void* attribute_val_out, int* flag);
 typedef int MPI_Delete_function(MPI_Comm comm, int keyval, void* attribute_val, void* extra_state);
-typedef int MPI_Comm_copy_attr_function(MPI_Comm oldcomm, int keyval, void* extra_state, void* attribute_val_in,
-                              void* attribute_val_out, int* flag);
-typedef int MPI_Comm_delete_attr_function(MPI_Comm comm, int keyval, void* attribute_val, void* extra_state);
+#define MPI_Comm_copy_attr_function MPI_Copy_function
+#define MPI_Comm_delete_attr_function MPI_Delete_function
 typedef int MPI_Type_copy_attr_function(MPI_Datatype type, int keyval, void* extra_state, void* attribute_val_in,
                               void* attribute_val_out, int* flag);
 typedef int MPI_Type_delete_attr_function(MPI_Datatype type, int keyval, void* attribute_val, void* extra_state);