X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8789d26b134d65148058b8ec759127e97055b67..ac151e89b9b3cad0074cd85f01334a3404132082:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 47ffd5f35f..97d02cc1ab 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,6 +7,7 @@ #ifndef SMPI_H #define SMPI_H +#include #include #include #include @@ -41,67 +42,123 @@ SG_BEGIN_DECL() #define SMPI_RAND_SEED 5 #define MPI_ANY_SOURCE -555 #define MPI_BOTTOM (void *)-111 -#define MPI_FORTRAN_BOTTOM -111 #define MPI_PROC_NULL -666 #define MPI_ANY_TAG -444 #define MPI_UNDEFINED -333 #define MPI_IN_PLACE (void *)-222 -#define MPI_FORTRAN_IN_PLACE -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_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 #define MPI_UNEQUAL 2 #define MPI_CONGRUENT 3 -#define MPI_WTIME_IS_GLOBAL 1 -#define MPI_TAG_UB 1000000 -#define MPI_HOST 0 -#define MPI_IO 0 + + #define MPI_BSEND_OVERHEAD 0 +/* Attribute keys */ +#define MPI_IO -1 +#define MPI_HOST -2 +#define MPI_WTIME_IS_GLOBAL -3 +#define MPI_APPNUM -4 +#define MPI_TAG_UB -5 +#define MPI_TAG_LB -6 +#define MPI_UNIVERSE_SIZE -7 +#define MPI_LASTUSEDCODE -8 + +#define MPI_MODE_NOSTORE 0x1 +#define MPI_MODE_NOPUT 0x2 +#define MPI_MODE_NOPRECEDE 0x4 +#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_APPNUM 0 -#define MPI_LASTUSEDCODE MPI_SUCCESS -#define MPI_ERR_LASTCODE MPI_SUCCESS +#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_REAL4 MPI_DATATYPE_NULL -#define MPI_REAL8 MPI_DATATYPE_NULL -#define MPI_REAL16 MPI_DATATYPE_NULL -#define MPI_COMPLEX8 MPI_DATATYPE_NULL -#define MPI_COMPLEX16 MPI_DATATYPE_NULL -#define MPI_COMPLEX32 MPI_DATATYPE_NULL -#define MPI_INTEGER1 MPI_DATATYPE_NULL -#define MPI_INTEGER2 MPI_DATATYPE_NULL -#define MPI_INTEGER4 MPI_DATATYPE_NULL -#define MPI_INTEGER8 MPI_DATATYPE_NULL -#define MPI_COMPLEX MPI_DATATYPE_NULL -#define MPI_DOUBLE_COMPLEX MPI_DATATYPE_NULL - #define MPI_DISTRIBUTE_BLOCK 0 #define MPI_DISTRIBUTE_NONE 1 #define MPI_DISTRIBUTE_CYCLIC 2 @@ -113,8 +170,9 @@ 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 #define MPI_VERSION 1 #define MPI_SUBVERSION 1 @@ -124,6 +182,7 @@ SG_BEGIN_DECL() #define MPI_LOCK_EXCLUSIVE 1 #define MPI_LOCK_SHARED 2 +// FIXME : used nowhere... typedef enum MPIR_Combiner_enum{ MPI_COMBINER_NAMED, MPI_COMBINER_DUP, @@ -155,6 +214,9 @@ typedef enum MPIR_Topo_type { typedef ptrdiff_t MPI_Aint; typedef long long MPI_Offset; +struct s_MPI_File; +typedef struct s_MPI_File *MPI_File; + struct s_smpi_mpi_datatype; typedef struct s_smpi_mpi_datatype *MPI_Datatype; @@ -165,12 +227,15 @@ typedef struct { int count; } MPI_Status; -#define MPI_STATUS_IGNORE NULL -#define MPI_STATUSES_IGNORE NULL -#define MPI_FORTRAN_STATUS_IGNORE -1 -#define MPI_FORTRAN_STATUSES_IGNORE -1 +struct s_smpi_mpi_win; +typedef struct s_smpi_mpi_win* MPI_Win; +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) -#define MPI_DATATYPE_NULL NULL +#define MPI_DATATYPE_NULL ((MPI_Datatype)NULL) XBT_PUBLIC_DATA( MPI_Datatype ) MPI_CHAR; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_SHORT; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT; @@ -193,7 +258,7 @@ XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT16_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT32_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_INT64_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT8_T; -#define MPI_BYTE MPI_UINT8_T +XBT_PUBLIC_DATA( MPI_Datatype ) MPI_BYTE; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT16_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT32_T; XBT_PUBLIC_DATA( MPI_Datatype ) MPI_UINT64_T; @@ -214,16 +279,57 @@ XBT_PUBLIC_DATA(MPI_Datatype) MPI_2INT; XBT_PUBLIC_DATA(MPI_Datatype) MPI_LONG_DOUBLE_INT; 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; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_COMPLEX8; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_COMPLEX16; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_COMPLEX32; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER1; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER2; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER4; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER8; +XBT_PUBLIC_DATA(MPI_Datatype) MPI_INTEGER16; + //for now we only send int values at max #define MPI_Count int #define MPI_COUNT MPI_INT +//defines for fortran compatibility +#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__) + #define MPI_INTEGER MPI_INT + #define MPI_2INTEGER MPI_2INT + #define MPI_LOGICAL MPI_INT +#else + #define MPI_INTEGER MPI_LONG + #define MPI_2INTEGER MPI_2LONG + #define MPI_LOGICAL MPI_LONG +#endif + +#define MPI_Fint int + +#define MPI_COMPLEX MPI_C_FLOAT_COMPLEX +#define MPI_DOUBLE_COMPLEX MPI_C_DOUBLE_COMPLEX +#define MPI_LOGICAL1 MPI_UINT8_T +#define MPI_LOGICAL2 MPI_UINT16_T +#define MPI_LOGICAL4 MPI_UINT32_T +#define MPI_LOGICAL8 MPI_UINT64_T +#define MPI_2REAL MPI_2FLOAT +#define MPI_CHARACTER MPI_CHAR +#define MPI_DOUBLE_PRECISION MPI_DOUBLE +#define MPI_2DOUBLE_PRECISION MPI_2DOUBLE + + + typedef void MPI_User_function(void *invec, void *inoutvec, int *len, MPI_Datatype * datatype); struct s_smpi_mpi_op; typedef struct s_smpi_mpi_op *MPI_Op; -#define MPI_OP_NULL NULL +#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; @@ -236,26 +342,30 @@ 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; +//For accumulate +XBT_PUBLIC_DATA( MPI_Op ) MPI_REPLACE; +struct s_smpi_mpi_topology; +typedef struct s_smpi_mpi_topology *MPI_Topology; + struct s_smpi_mpi_group; typedef struct s_smpi_mpi_group *MPI_Group; -#define MPI_GROUP_NULL NULL +#define MPI_GROUP_NULL ((MPI_Group)NULL) XBT_PUBLIC_DATA( MPI_Group ) MPI_GROUP_EMPTY; struct s_smpi_mpi_communicator; typedef struct s_smpi_mpi_communicator *MPI_Comm; -#define MPI_COMM_NULL NULL +#define MPI_COMM_NULL ((MPI_Comm)NULL) XBT_PUBLIC_DATA( MPI_Comm ) MPI_COMM_WORLD; -XBT_PUBLIC_DATA( int ) MPI_UNIVERSE_SIZE; #define MPI_COMM_SELF smpi_process_comm_self() struct s_smpi_mpi_request; typedef struct s_smpi_mpi_request *MPI_Request; -#define MPI_REQUEST_NULL NULL +#define MPI_REQUEST_NULL ((MPI_Request)NULL) #define MPI_FORTRAN_REQUEST_NULL -1 MPI_CALL(XBT_PUBLIC(int), MPI_Init, (int *argc, char ***argv)); @@ -513,19 +623,46 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Get_library_version, MPI_CALL(XBT_PUBLIC(int), MPI_Reduce_local,(void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_free,( MPI_Win* win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_create,( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_set_name,(MPI_Win win, char * name)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_get_name,(MPI_Win win, char * name, int* len)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_get_group,(MPI_Win win, MPI_Group * group)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_fence,( int assert, MPI_Win win)); + +MPI_CALL(XBT_PUBLIC(int), MPI_Get,( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Put,( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Accumulate,( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Alloc_mem, (MPI_Aint size, MPI_Info info, void *baseptr)); +MPI_CALL(XBT_PUBLIC(int), MPI_Free_mem, (void *base)); + +MPI_CALL(XBT_PUBLIC(MPI_Datatype), MPI_Type_f2c,(MPI_Fint datatype)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Type_c2f,(MPI_Datatype datatype)); +MPI_CALL(XBT_PUBLIC(MPI_Group), MPI_Group_f2c,(MPI_Fint group)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Group_c2f,(MPI_Group group)); +MPI_CALL(XBT_PUBLIC(MPI_Request), MPI_Request_f2c,(MPI_Fint request)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Request_c2f,(MPI_Request request)); +MPI_CALL(XBT_PUBLIC(MPI_Win), MPI_Win_f2c,(MPI_Fint win)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Win_c2f,(MPI_Win win)); +MPI_CALL(XBT_PUBLIC(MPI_Op), MPI_Op_f2c,(MPI_Fint op)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Op_c2f,(MPI_Op op)); +MPI_CALL(XBT_PUBLIC(MPI_Comm), MPI_Comm_f2c,(MPI_Fint comm)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Comm_c2f,(MPI_Comm comm)); + //FIXME: these are not yet implemented typedef void MPI_Handler_function(MPI_Comm*, int*, ...); -typedef int MPI_Win; -typedef int MPI_Info; + 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); @@ -548,7 +685,10 @@ 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; - +MPI_CALL(XBT_PUBLIC(MPI_Info), MPI_Info_f2c,(MPI_Fint info)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Info_c2f,(MPI_Info info)); +MPI_CALL(XBT_PUBLIC(MPI_Errhandler), MPI_Errhandler_f2c,(MPI_Fint errhandler)); +MPI_CALL(XBT_PUBLIC(MPI_Fint), MPI_Errhandler_c2f,(MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC(int), MPI_Pack_size, (int incount, MPI_Datatype datatype, MPI_Comm comm, int* size)); MPI_CALL(XBT_PUBLIC(int), MPI_Cart_coords, (MPI_Comm comm, int rank, int maxdims, int* coords)); MPI_CALL(XBT_PUBLIC(int), MPI_Cart_create, (MPI_Comm comm_old, int ndims, int* dims, int* periods, int reorder, MPI_Comm* comm_cart)); @@ -620,9 +760,7 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Get_elements, (MPI_Status* status, MPI_Datatype da MPI_CALL(XBT_PUBLIC(int), MPI_Dims_create, (int nnodes, int ndims, int* dims)); MPI_CALL(XBT_PUBLIC(int), MPI_Initialized, (int* flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Pcontrol, (const int level )); -MPI_CALL(XBT_PUBLIC(int), MPI_Win_fence,( int assert, MPI_Win win)); -MPI_CALL(XBT_PUBLIC(int), MPI_Win_free,( MPI_Win* win)); -MPI_CALL(XBT_PUBLIC(int), MPI_Win_create,( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win)); + MPI_CALL(XBT_PUBLIC(int), MPI_Info_create,( MPI_Info *info)); MPI_CALL(XBT_PUBLIC(int), MPI_Info_set,( MPI_Info info, char *key, char *value)); MPI_CALL(XBT_PUBLIC(int), MPI_Info_get,(MPI_Info info,char *key,int valuelen, char *value, int *flag)); @@ -633,8 +771,8 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Info_get_nkeys,( MPI_Info info, int *nkeys)); MPI_CALL(XBT_PUBLIC(int), MPI_Info_get_nthkey,( MPI_Info info, int n, char *key)); MPI_CALL(XBT_PUBLIC(int), MPI_Info_get_valuelen,( MPI_Info info, char *key, int *valuelen, int *flag)); -MPI_CALL(XBT_PUBLIC(int), MPI_Get,( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win)); + +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_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, MPI_Aint* array_of_addresses, @@ -673,17 +811,35 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Comm_spawn,( char *command, char **argv, int maxpr MPI_CALL(XBT_PUBLIC(int), MPI_Comm_spawn_multiple,( int count, char **array_of_commands, char*** array_of_argv, int* array_of_maxprocs, MPI_Info* array_of_info, int root, MPI_Comm comm, MPI_Comm *intercomm, int* array_of_errcodes)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_parent,( MPI_Comm *parent)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_complete,(MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_lock,(int lock_type, int rank, int assert, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_post,(MPI_Group group, int assert, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_start,(MPI_Group group, int assert, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_test,(MPI_Win win, int *flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_unlock,(int rank, MPI_Win win)); +MPI_CALL(XBT_PUBLIC(int), MPI_Win_wait,(MPI_Win win)); //FIXME: End of all the not yet implemented stuff // smpi functions +XBT_PUBLIC(int) smpi_global_size(void); XBT_PUBLIC(MPI_Comm) smpi_process_comm_self(void); /* XBT_PUBLIC(void) smpi_exit(int); */ +XBT_PUBLIC(void) smpi_execute_flops(double flops); +XBT_PUBLIC(void) smpi_execute(double duration); + +XBT_PUBLIC(double) smpi_get_host_power_peak_at(int pstate_index); +XBT_PUBLIC(double) smpi_get_host_current_power_peak(void); +XBT_PUBLIC(int) smpi_get_host_nb_pstates(void); +XBT_PUBLIC(void) smpi_set_host_power_peak_at(int pstate_index); +XBT_PUBLIC(double) smpi_get_host_consumed_energy(void); + +XBT_PUBLIC(int) smpi_usleep(useconds_t usecs); XBT_PUBLIC(unsigned int) smpi_sleep(unsigned int secs); -XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv); +XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv, void* tz); XBT_PUBLIC(unsigned long long) smpi_rastro_resolution (void); XBT_PUBLIC(unsigned long long) smpi_rastro_timestamp (void); XBT_PUBLIC(void) smpi_sample_1(int global, const char *file, int line, @@ -723,11 +879,19 @@ XBT_PUBLIC(int) __attribute__((weak)) MAIN__(void); XBT_PUBLIC(int) smpi_main(int (*realmain) (int argc, char *argv[]),int argc, char *argv[]); XBT_PUBLIC(void) __attribute__((weak)) user_main_(void); XBT_PUBLIC(int) smpi_process_index(void); +XBT_PUBLIC(void) smpi_process_init(int *argc, char ***argv); /* Trace replay specific stuff */ XBT_PUBLIC(void) smpi_replay_init(int *argc, char***argv); XBT_PUBLIC(void) smpi_action_trace_run(char *); XBT_PUBLIC(int) smpi_replay_finalize(void); +XBT_PUBLIC(void) SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes); +XBT_PUBLIC(void) SMPI_init(void); +XBT_PUBLIC(void) SMPI_finalize(void); + + + + SG_END_DECL() #endif