X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/589ff6c6a4607393e259f7c703a06bed216f213d..42f80f7c0ce00e583f9c787127492afecd17419e:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 557d7eef74..f9cba1c87b 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -39,7 +39,7 @@ SG_BEGIN_DECL #define MPI_MAX_PROCESSOR_NAME 100 #define MPI_MAX_NAME_STRING 100 #define MPI_MAX_ERROR_STRING 100 -#define MPI_MAX_DATAREP_STRIN 100 +#define MPI_MAX_DATAREP_STRING 128 #define MPI_MAX_INFO_KEY 100 #define MPI_MAX_INFO_VAL 100 #define MPI_MAX_OBJECT_NAME 100 @@ -153,6 +153,7 @@ enum ERROR_ENUM { #define MPI_TAG_LB -6 #define MPI_UNIVERSE_SIZE -7 #define MPI_LASTUSEDCODE -8 +#define MPI_KEYVAL_INVALID -9 #define MPI_MODE_NOSTORE 0x1 #define MPI_MODE_NOPUT 0x2 @@ -160,15 +161,10 @@ enum ERROR_ENUM { #define MPI_MODE_NOSUCCEED 0x8 #define MPI_MODE_NOCHECK 0x10 -#define MPI_KEYVAL_INVALID 0 #define MPI_NULL_COPY_FN NULL #define MPI_NULL_DELETE_FN NULL #define MPI_ERR_LASTCODE 74 -#define MPI_CXX_BOOL MPI_DATATYPE_NULL -#define MPI_CXX_FLOAT_COMPLEX MPI_DATATYPE_NULL -#define MPI_CXX_DOUBLE_COMPLEX MPI_DATATYPE_NULL -#define MPI_CXX_LONG_DOUBLE_COMPLEX MPI_DATATYPE_NULL #define MPI_REAL2 MPI_DATATYPE_NULL #define MPI_COMPLEX4 MPI_DATATYPE_NULL @@ -210,7 +206,6 @@ enum ERROR_ENUM { #define MPI_SEEK_SET 600 #define MPI_SEEK_CUR 602 #define MPI_SEEK_END 604 -#define MPI_MAX_DATAREP_STRING 128 #define MPI_WIN_BASE -1 #define MPI_WIN_SIZE -2 @@ -243,66 +238,147 @@ typedef SMPI_Info* MPI_Info; #define MPI_STATUSES_IGNORE ((MPI_Status*)NULL) #define MPI_STATUS_SIZE 5 -XBT_PUBLIC_DATA const MPI_Datatype MPI_DATATYPE_NULL; -XBT_PUBLIC_DATA const MPI_Datatype MPI_CHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_SHORT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_LONG; +#if !defined(DLL_EXPORT) +#if defined(c_plusplus) || defined(__cplusplus) +#define SMPI_PREDEFINED_POINTER(type, internal) (static_cast (static_cast (&(internal)))) +#else +#define SMPI_PREDEFINED_POINTER(type, internal) ((type) ((void *) &(internal))) +#endif +#else +#define SMPI_PREDEFINED_POINTER(type, internal) ((type) &(internal)) +#endif + +extern SMPI_Datatype smpi_MPI_DATATYPE_NULL; +extern SMPI_Datatype smpi_MPI_CHAR; +extern SMPI_Datatype smpi_MPI_SHORT; +extern SMPI_Datatype smpi_MPI_INT; +extern SMPI_Datatype smpi_MPI_LONG; +extern SMPI_Datatype smpi_MPI_LONG_LONG; +extern SMPI_Datatype smpi_MPI_SIGNED_CHAR; +extern SMPI_Datatype smpi_MPI_UNSIGNED_CHAR; +extern SMPI_Datatype smpi_MPI_UNSIGNED_SHORT; +extern SMPI_Datatype smpi_MPI_UNSIGNED; +extern SMPI_Datatype smpi_MPI_UNSIGNED_LONG; +extern SMPI_Datatype smpi_MPI_UNSIGNED_LONG_LONG; +extern SMPI_Datatype smpi_MPI_FLOAT; +extern SMPI_Datatype smpi_MPI_DOUBLE; +extern SMPI_Datatype smpi_MPI_LONG_DOUBLE; +extern SMPI_Datatype smpi_MPI_WCHAR; +extern SMPI_Datatype smpi_MPI_C_BOOL; +extern SMPI_Datatype smpi_MPI_INT8_T; +extern SMPI_Datatype smpi_MPI_INT16_T; +extern SMPI_Datatype smpi_MPI_INT32_T; +extern SMPI_Datatype smpi_MPI_INT64_T; +extern SMPI_Datatype smpi_MPI_UINT8_T; +extern SMPI_Datatype smpi_MPI_BYTE; +extern SMPI_Datatype smpi_MPI_UINT16_T; +extern SMPI_Datatype smpi_MPI_UINT32_T; +extern SMPI_Datatype smpi_MPI_UINT64_T; +extern SMPI_Datatype smpi_MPI_C_FLOAT_COMPLEX; +extern SMPI_Datatype smpi_MPI_C_DOUBLE_COMPLEX; +extern SMPI_Datatype smpi_MPI_C_LONG_DOUBLE_COMPLEX; +extern SMPI_Datatype smpi_MPI_AINT; +extern SMPI_Datatype smpi_MPI_OFFSET; +extern SMPI_Datatype smpi_MPI_LB; +extern SMPI_Datatype smpi_MPI_UB; +extern SMPI_Datatype smpi_MPI_FLOAT_INT; +extern SMPI_Datatype smpi_MPI_LONG_INT; +extern SMPI_Datatype smpi_MPI_DOUBLE_INT; +extern SMPI_Datatype smpi_MPI_SHORT_INT; +extern SMPI_Datatype smpi_MPI_2INT; +extern SMPI_Datatype smpi_MPI_LONG_DOUBLE_INT; +extern SMPI_Datatype smpi_MPI_2FLOAT; +extern SMPI_Datatype smpi_MPI_2DOUBLE; +extern SMPI_Datatype smpi_MPI_2LONG; +extern SMPI_Datatype smpi_MPI_REAL; +extern SMPI_Datatype smpi_MPI_REAL4; +extern SMPI_Datatype smpi_MPI_REAL8; +extern SMPI_Datatype smpi_MPI_REAL16; +extern SMPI_Datatype smpi_MPI_COMPLEX8; +extern SMPI_Datatype smpi_MPI_COMPLEX16; +extern SMPI_Datatype smpi_MPI_COMPLEX32; +extern SMPI_Datatype smpi_MPI_INTEGER1; +extern SMPI_Datatype smpi_MPI_INTEGER2; +extern SMPI_Datatype smpi_MPI_INTEGER4; +extern SMPI_Datatype smpi_MPI_INTEGER8; +extern SMPI_Datatype smpi_MPI_INTEGER16; +extern SMPI_Datatype smpi_MPI_COUNT; +extern SMPI_Datatype smpi_MPI_CXX_BOOL; +extern SMPI_Datatype smpi_MPI_MPI_CXX_FLOAT_COMPLEX; +extern SMPI_Datatype smpi_MPI_MPI_CXX_DOULE_COMPLEX; +extern SMPI_Datatype smpi_MPI_MPI_CXX_LONG_DOUBLE_COMPLEX; + +#define MPI_DATATYPE_NULL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DATATYPE_NULL) +#define MPI_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CHAR) +#define MPI_SHORT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_SHORT) +#define MPI_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT) +#define MPI_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG) +#define MPI_LONG_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_LONG) #define MPI_LONG_LONG_INT MPI_LONG_LONG -XBT_PUBLIC_DATA const MPI_Datatype MPI_SIGNED_CHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_CHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_SHORT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_LONG; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UNSIGNED_LONG_LONG; -XBT_PUBLIC_DATA const MPI_Datatype MPI_FLOAT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_DOUBLE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_DOUBLE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_WCHAR; -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_BOOL; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT8_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT16_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT32_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INT64_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT8_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_BYTE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT16_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT32_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UINT64_T; -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_FLOAT_COMPLEX; +#define MPI_SIGNED_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_SIGNED_CHAR) +#define MPI_UNSIGNED_CHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_CHAR) +#define MPI_UNSIGNED_SHORT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_SHORT) +#define MPI_UNSIGNED SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED) +#define MPI_UNSIGNED_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_LONG) +#define MPI_UNSIGNED_LONG_LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UNSIGNED_LONG_LONG) +#define MPI_FLOAT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_FLOAT) +#define MPI_DOUBLE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DOUBLE) +#define MPI_LONG_DOUBLE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_DOUBLE) +#define MPI_WCHAR SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_WCHAR) +#define MPI_C_BOOL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_BOOL) +#define MPI_INT8_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT8_T) +#define MPI_INT16_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT16_T) +#define MPI_INT32_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT32_T) +#define MPI_INT64_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INT64_T) +#define MPI_UINT8_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT8_T) +#define MPI_BYTE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_BYTE) +#define MPI_UINT16_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT16_T) +#define MPI_UINT32_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT32_T) +#define MPI_UINT64_T SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UINT64_T) +#define MPI_C_FLOAT_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_FLOAT_COMPLEX) #define MPI_C_COMPLEX MPI_C_FLOAT_COMPLEX -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_DOUBLE_COMPLEX; -XBT_PUBLIC_DATA const MPI_Datatype MPI_C_LONG_DOUBLE_COMPLEX; -XBT_PUBLIC_DATA const MPI_Datatype MPI_AINT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_OFFSET; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LB; -XBT_PUBLIC_DATA const MPI_Datatype MPI_UB; +#define MPI_C_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_DOUBLE_COMPLEX) +#define MPI_C_LONG_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_C_LONG_DOUBLE_COMPLEX) +#define MPI_AINT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_AINT) +#define MPI_OFFSET SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_OFFSET) +#define MPI_LB SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LB) +#define MPI_UB SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_UB) //The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC. -XBT_PUBLIC_DATA const MPI_Datatype MPI_FLOAT_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_DOUBLE_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_SHORT_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_LONG_DOUBLE_INT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2FLOAT; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2DOUBLE; -XBT_PUBLIC_DATA const MPI_Datatype MPI_2LONG; // only for compatibility with Fortran - -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL; -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL4; -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL8; -XBT_PUBLIC_DATA const MPI_Datatype MPI_REAL16; -XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX8; -XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX16; -XBT_PUBLIC_DATA const MPI_Datatype MPI_COMPLEX32; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER1; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER2; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER4; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER8; -XBT_PUBLIC_DATA const MPI_Datatype MPI_INTEGER16; - -XBT_PUBLIC_DATA const MPI_Datatype MPI_COUNT; +#define MPI_FLOAT_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_FLOAT_INT) +#define MPI_LONG_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_INT) +#define MPI_DOUBLE_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_DOUBLE_INT) +#define MPI_SHORT_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_SHORT_INT) +#define MPI_2INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2INT) +#define MPI_LONG_DOUBLE_INT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_LONG_DOUBLE_INT) +#define MPI_2FLOAT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2FLOAT) +#define MPI_2DOUBLE SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2DOUBLE) +#define MPI_2LONG SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_2LONG) + // only for compatibility with Fortran +#define MPI_REAL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL) +#define MPI_REAL4 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL4) +#define MPI_REAL8 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL8) +#define MPI_REAL16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_REAL16) +#define MPI_COMPLEX8 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COMPLEX8) +#define MPI_COMPLEX16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COMPLEX16) +#define MPI_COMPLEX32 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COMPLEX32) +#define MPI_INTEGER1 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER1) +#define MPI_INTEGER2 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER2) +#define MPI_INTEGER4 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER4) +#define MPI_INTEGER8 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER8) +#define MPI_INTEGER16 SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_INTEGER16) +#define MPI_COUNT SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_COUNT) + +#if defined(c_plusplus) || defined(__cplusplus) +#define MPI_CXX_BOOL SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_BOOL) +#define MPI_CXX_FLOAT_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_FLOAT_COMPLEX) +#define MPI_CXX_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_DOUBLE_COMPLEX) +#define MPI_CXX_LONG_DOUBLE_COMPLEX SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_CXX_LONG_DOUBLE_COMPLEX) +#else +#define MPI_CXX_BOOL MPI_DATATYPE_NULL +#define MPI_CXX_FLOAT_COMPLEX MPI_DATATYPE_NULL +#define MPI_CXX_DOUBLE_COMPLEX MPI_DATATYPE_NULL +#define MPI_CXX_LONG_DOUBLE_COMPLEX MPI_DATATYPE_NULL +#endif //defines for fortran compatibility #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) || defined(__aarch64__) @@ -337,27 +413,45 @@ typedef void MPI_User_function(void *invec, void *inoutvec, int *len, MPI_Dataty typedef SMPI_Op *MPI_Op; #define MPI_OP_NULL ((MPI_Op)NULL) -XBT_PUBLIC_DATA MPI_Op MPI_MAX; -XBT_PUBLIC_DATA MPI_Op MPI_MIN; -XBT_PUBLIC_DATA MPI_Op MPI_MAXLOC; -XBT_PUBLIC_DATA MPI_Op MPI_MINLOC; -XBT_PUBLIC_DATA MPI_Op MPI_SUM; -XBT_PUBLIC_DATA MPI_Op MPI_PROD; -XBT_PUBLIC_DATA MPI_Op MPI_LAND; -XBT_PUBLIC_DATA MPI_Op MPI_LOR; -XBT_PUBLIC_DATA MPI_Op MPI_LXOR; -XBT_PUBLIC_DATA MPI_Op MPI_BAND; -XBT_PUBLIC_DATA MPI_Op MPI_BOR; -XBT_PUBLIC_DATA MPI_Op MPI_BXOR; +extern SMPI_Op smpi_MPI_MAX; +extern SMPI_Op smpi_MPI_MIN; +extern SMPI_Op smpi_MPI_MAXLOC; +extern SMPI_Op smpi_MPI_MINLOC; +extern SMPI_Op smpi_MPI_SUM; +extern SMPI_Op smpi_MPI_PROD; +extern SMPI_Op smpi_MPI_LAND; +extern SMPI_Op smpi_MPI_LOR; +extern SMPI_Op smpi_MPI_LXOR; +extern SMPI_Op smpi_MPI_BAND; +extern SMPI_Op smpi_MPI_BOR; +extern SMPI_Op smpi_MPI_BXOR; +extern SMPI_Op smpi_MPI_REPLACE; +extern SMPI_Op smpi_MPI_NO_OP; + +#define MPI_MAX SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MAX) +#define MPI_MIN SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MIN) +#define MPI_MAXLOC SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MAXLOC) +#define MPI_MINLOC SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_MINLOC) +#define MPI_SUM SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_SUM) +#define MPI_PROD SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_PROD) +#define MPI_LAND SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_LAND) +#define MPI_LOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_LOR) +#define MPI_LXOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_LXOR) +#define MPI_BAND SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_BAND) +#define MPI_BOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_BOR) +#define MPI_BXOR SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_BXOR) + //For accumulate -XBT_PUBLIC_DATA MPI_Op MPI_REPLACE; -XBT_PUBLIC_DATA MPI_Op MPI_NO_OP; +#define MPI_REPLACE SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_REPLACE) +#define MPI_NO_OP SMPI_PREDEFINED_POINTER(MPI_Op, smpi_MPI_NO_OP) + typedef SMPI_Group* MPI_Group; -#define MPI_GROUP_NULL ((MPI_Group)NULL) +extern SMPI_Group smpi_MPI_GROUP_EMPTY; +#define MPI_GROUP_EMPTY SMPI_PREDEFINED_POINTER(MPI_Group, smpi_MPI_GROUP_EMPTY) -XBT_PUBLIC_DATA MPI_Group MPI_GROUP_EMPTY; +#define MPI_GROUP_NULL ((MPI_Group)NULL) typedef SMPI_Comm* MPI_Comm; @@ -373,8 +467,10 @@ typedef SMPI_Request* MPI_Request; typedef SMPI_Errhandler* MPI_Errhandler; #define MPI_ERRHANDLER_NULL ((MPI_Errhandler)NULL) -XBT_PUBLIC_DATA MPI_Errhandler MPI_ERRORS_RETURN; -XBT_PUBLIC_DATA MPI_Errhandler MPI_ERRORS_ARE_FATAL; +extern SMPI_Errhandler smpi_MPI_ERRORS_RETURN; +#define MPI_ERRORS_RETURN SMPI_PREDEFINED_POINTER(MPI_Errhandler, smpi_MPI_ERRORS_RETURN) +extern SMPI_Errhandler smpi_MPI_ERRORS_ARE_FATAL; +#define MPI_ERRORS_ARE_FATAL SMPI_PREDEFINED_POINTER(MPI_Errhandler, smpi_MPI_ERRORS_ARE_FATAL) typedef enum SMPI_Combiner_enum{ MPI_COMBINER_NAMED, @@ -898,7 +994,9 @@ typedef void* MPI_Message; #define MPI_TYPE_DUP_FN ((MPI_Type_copy_attr_function*)MPI_DUP_FN) #define MPI_COMM_DUP_FN ((MPI_Comm_copy_attr_function *)MPI_DUP_FN) #define MPI_INFO_ENV smpi_process_info_env() -XBT_PUBLIC_DATA const MPI_Datatype MPI_PACKED; +extern SMPI_Datatype smpi_MPI_PACKED; +#define MPI_PACKED SMPI_PREDEFINED_POINTER(MPI_Datatype, smpi_MPI_PACKED) + MPI_CALL(XBT_PUBLIC int, MPI_Cart_map, (MPI_Comm comm_old, int ndims, const int* dims, const int* periods, int* newrank)); MPI_CALL(XBT_PUBLIC int, MPI_Graph_create, @@ -1117,9 +1215,9 @@ XBT_PUBLIC int smpi_main(const char* program, int argc, char* argv[]); /* Trace replay specific stuff */ XBT_PUBLIC void smpi_replay_init(const char* instance_id, int rank, double start_delay_flops); // Only initialization -XBT_PUBLIC void smpi_replay_main(int rank, const char* trace_filename); // Launch the replay once init is done +XBT_PUBLIC void smpi_replay_main(int rank, const char* private_trace_filename); // Launch the replay once init is done XBT_PUBLIC void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, - const char* trace_filename); // Both init and start + const char* private_trace_filename); // Both init and start XBT_PUBLIC void SMPI_app_instance_register(const char* name, xbt_main_func_t code, int num_processes); XBT_PUBLIC void SMPI_init();