X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2d907185a41d4e59e9f4eaa7d42700ea9483140..98755faee042e94d1ff52f6e9508b18015bb1ae5:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 309804ac9e..c4e27b890a 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -15,14 +15,18 @@ #include #include +#ifdef __cplusplus +#include +#endif + #ifdef _WIN32 -#define MPI_CALL(type,name,args) \ - type name args; \ - type P##name args +#define MPI_CALL(type, name, args) \ + type name args; \ + type _XBT_CONCAT(P, name) args #else -#define MPI_CALL(type,name,args) \ - type name args __attribute__((weak)); \ - type P##name args +#define MPI_CALL(type, name, args) \ + type name args __attribute__((weak)); \ + type _XBT_CONCAT(P, name) args #endif SG_BEGIN_DECL() @@ -125,7 +129,7 @@ SG_BEGIN_DECL() ERROR(MPI_T_ERR_PVAR_NO_ATOMIC) #define GENERATE_ENUM(ENUM) ENUM, -#define GENERATE_STRING(STRING) #STRING, +#define GENERATE_STRING(STRING) _XBT_STRINGIFY(STRING), enum ERROR_ENUM { FOREACH_ERROR(GENERATE_ENUM) @@ -230,6 +234,7 @@ typedef SMPI_Info* MPI_Info; #define MPI_STATUS_IGNORE ((MPI_Status*)NULL) #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; @@ -359,6 +364,10 @@ typedef SMPI_Request* MPI_Request; #define MPI_REQUEST_NULL ((MPI_Request)NULL) #define MPI_FORTRAN_REQUEST_NULL -1 +typedef SMPI_Errhandler* MPI_Errhandler; +#define MPI_ERRHANDLER_NULL ((MPI_Errhandler)NULL) + + typedef enum SMPI_Topo_type { MPI_GRAPH=1, MPI_CART=2, @@ -807,8 +816,6 @@ typedef enum MPIR_Combiner_enum{ }MPIR_Combiner_enum; typedef void MPI_Handler_function(MPI_Comm*, int*, ...); - -typedef void* MPI_Errhandler; typedef void* MPI_Message; typedef void MPI_Comm_errhandler_function(MPI_Comm *, int *, ...); typedef void MPI_File_errhandler_function(MPI_File *, int *, ...); @@ -823,9 +830,8 @@ typedef MPI_File_errhandler_function MPI_File_errhandler_fn; typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn; #define MPI_INFO_ENV smpi_process_info_env() XBT_PUBLIC_DATA const MPI_Datatype MPI_PACKED; -XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRORS_RETURN; -XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRORS_ARE_FATAL; -XBT_PUBLIC_DATA MPI_Errhandler* MPI_ERRHANDLER_NULL; +XBT_PUBLIC_DATA MPI_Errhandler MPI_ERRORS_RETURN; +XBT_PUBLIC_DATA MPI_Errhandler MPI_ERRORS_ARE_FATAL; MPI_CALL(XBT_PUBLIC MPI_Errhandler, MPI_Errhandler_f2c, (MPI_Fint errhandler)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Errhandler_c2f, (MPI_Errhandler errhandler)); @@ -873,7 +879,9 @@ MPI_CALL(XBT_PUBLIC int, MPI_Get_elements, (MPI_Status * status, MPI_Datatype da MPI_CALL(XBT_PUBLIC int, MPI_Pcontrol, (const int level, ...)); MPI_CALL(XBT_PUBLIC int, MPI_Win_set_errhandler, (MPI_Win win, MPI_Errhandler errhandler)); -MPI_CALL(XBT_PUBLIC int, MPI_Type_get_envelope, +MPI_CALL(XBT_PUBLIC int, MPI_Win_get_errhandler, (MPI_Win win, MPI_Errhandler* errhandler)); +MPI_CALL(XBT_PUBLIC int, MPI_Win_create_errhandler, (MPI_Win_errhandler_fn * function, MPI_Errhandler* errhandler)); +MPI_CALL(XBT_PUBLIC int, MPI_Win_call_errhandler, (MPI_Win win, int errorcode));MPI_CALL(XBT_PUBLIC int, MPI_Type_get_envelope, (MPI_Datatype datatype, int* num_integers, int* num_addresses, int* num_datatypes, int* combiner)); MPI_CALL(XBT_PUBLIC int, MPI_Type_get_contents, (MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, @@ -998,7 +1006,7 @@ XBT_PUBLIC void smpi_trace_set_call_location_(const char* file, int* line); /** Fortran binding + -fsecond-underscore **/ XBT_PUBLIC void smpi_trace_set_call_location__(const char* file, int* line); -#define SMPI_ITER_NAME1(line) iter_count##line +#define SMPI_ITER_NAME1(line) _XBT_CONCAT(iter_count, line) #define SMPI_ITER_NAME(line) SMPI_ITER_NAME1(line) #define SMPI_SAMPLE_LOOP(loop_init, loop_end, loop_iter, global, iters, thres)\ int SMPI_ITER_NAME(__LINE__)=0;\ @@ -1028,14 +1036,14 @@ XBT_PUBLIC void smpi_shared_free(void* data); XBT_PUBLIC int smpi_shared_known_call(const char* func, const char* input); XBT_PUBLIC void* smpi_shared_get_call(const char* func, const char* input); XBT_PUBLIC void* smpi_shared_set_call(const char* func, const char* input, void* data); -#define SMPI_SHARED_CALL(func, input, ...) \ - (smpi_shared_known_call(#func, input) ? smpi_shared_get_call(#func, input) \ - : smpi_shared_set_call(#func, input, (func(__VA_ARGS__)))) +#define SMPI_SHARED_CALL(func, input, ...) \ + (smpi_shared_known_call(_XBT_STRINGIFY(func), input) \ + ? smpi_shared_get_call(_XBT_STRINGIFY(func), input) \ + : smpi_shared_set_call(_XBT_STRINGIFY(func), input, (func(__VA_ARGS__)))) /* Fortran specific stuff */ XBT_PUBLIC int smpi_main(const char* program, int argc, char* argv[]); -XBT_PUBLIC void smpi_process_init(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 @@ -1051,15 +1059,12 @@ SG_END_DECL() /* C++ declarations for shared_malloc */ #ifdef __cplusplus -#include - XBT_PUBLIC int smpi_is_shared(void* ptr, std::vector>& private_blocks, size_t* offset); std::vector> shift_and_frame_private_blocks(const std::vector>& vec, size_t offset, size_t buff_size); std::vector> merge_private_blocks(const std::vector>& src, const std::vector>& dst); - #endif #endif