X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e830ec2832ab05f4bc81e681e7388b056e8ca12..b2208a5ab266b760d9b1b26198b38f2b0ade2e26:/include/smpi/smpi.h?ds=sidebyside diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index b2589b86d5..50e61d152b 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -12,6 +12,9 @@ #include #include +#define sleep(x) smpi_sleep(x) +#define gettimeofday(x, y) smpi_gettimeofday(x, y) + #define MPI_CALL(type,name,args) \ type name args __attribute__((weak)); \ type P##name args @@ -23,6 +26,7 @@ SG_BEGIN_DECL() #define MPI_THREAD_MULTIPLE 3 //FIXME: check values #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_INFO_KEY 100 @@ -31,9 +35,10 @@ SG_BEGIN_DECL() #define MPI_MAX_PORT_NAME 100 #define SMPI_RAND_SEED 5 #define MPI_ANY_SOURCE -1 +#define MPI_BOTTOM (void *)0 #define MPI_PROC_NULL -2 #define MPI_ANY_TAG -1 -#define MPI_UNDEFINED -1 +#define MPI_UNDEFINED -3 // errorcodes #define MPI_SUCCESS 0 #define MPI_ERR_COMM 1 @@ -53,6 +58,10 @@ SG_BEGIN_DECL() #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 + typedef ptrdiff_t MPI_Aint; typedef long long MPI_Offset; @@ -67,6 +76,7 @@ typedef struct { } MPI_Status; #define MPI_STATUS_IGNORE NULL +#define MPI_STATUSES_IGNORE NULL #define MPI_DATATYPE_NULL NULL extern MPI_Datatype MPI_CHAR; @@ -101,7 +111,8 @@ extern MPI_Datatype MPI_C_DOUBLE_COMPLEX; extern MPI_Datatype MPI_C_LONG_DOUBLE_COMPLEX; extern MPI_Datatype MPI_AINT; extern MPI_Datatype MPI_OFFSET; - +extern MPI_Datatype MPI_LB; +extern MPI_Datatype MPI_UB; //The following are datatypes for the MPI functions MPI_MAXLOC and MPI_MINLOC. extern MPI_Datatype MPI_FLOAT_INT; extern MPI_Datatype MPI_LONG_INT; @@ -157,7 +168,7 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Query_thread, (int *provided)); MPI_CALL(XBT_PUBLIC(int), MPI_Is_thread_main, (int *flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Abort, (MPI_Comm comm, int errorcode)); MPI_CALL(XBT_PUBLIC(double), MPI_Wtime, (void)); - +MPI_CALL(XBT_PUBLIC(double), MPI_Wtick,(void)); MPI_CALL(XBT_PUBLIC(int), MPI_Address, (void *location, MPI_Aint * address)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_free, (MPI_Datatype * datatype)); @@ -168,7 +179,28 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Type_get_extent, MPI_CALL(XBT_PUBLIC(int), MPI_Type_extent, (MPI_Datatype datatype, MPI_Aint * extent)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_lb, (MPI_Datatype datatype, MPI_Aint * disp)); MPI_CALL(XBT_PUBLIC(int), MPI_Type_ub, (MPI_Datatype datatype, MPI_Aint * disp)); - +MPI_CALL(XBT_PUBLIC(int), MPI_Type_commit, (MPI_Datatype* datatype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_hindexed, + (int count, int* blocklens, MPI_Aint* indices, + MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_hvector, + (int count, int blocklen, MPI_Aint stride, + MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_indexed, + (int count, int* blocklens, int* indices, + MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_struct, + (int count, int* blocklens, MPI_Aint* indices, + MPI_Datatype* old_types, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_vector, + (int count, int blocklen, int stride, + MPI_Datatype old_type, MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Type_contiguous, + (int count, MPI_Datatype old_type, + MPI_Datatype* newtype)); +MPI_CALL(XBT_PUBLIC(int), MPI_Testall, + (int count, MPI_Request* requests, int* flag, + MPI_Status* statuses)); MPI_CALL(XBT_PUBLIC(int), MPI_Op_create, (MPI_User_function * function, int commute, MPI_Op * op)); @@ -208,6 +240,7 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Group_range_excl, MPI_CALL(XBT_PUBLIC(int), MPI_Comm_rank, (MPI_Comm comm, int *rank)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_size, (MPI_Comm comm, int *size)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_name, (MPI_Comm comm, char* name, int* len)); MPI_CALL(XBT_PUBLIC(int), MPI_Get_processor_name, (char *name, int *resultlen)); MPI_CALL(XBT_PUBLIC(int), MPI_Get_count, (MPI_Status * status, MPI_Datatype datatype, @@ -220,6 +253,7 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Comm_dup, (MPI_Comm comm, MPI_Comm * newcomm)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_create, (MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_free, (MPI_Comm * comm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_disconnect, (MPI_Comm * comm)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_split, (MPI_Comm comm, int color, int key, MPI_Comm* comm_out)); MPI_CALL(XBT_PUBLIC(int), MPI_Send_init, @@ -276,7 +310,10 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Waitsome, (int incount, MPI_Request requests[], int *outcount, int *indices, MPI_Status status[])); - +MPI_CALL(XBT_PUBLIC(int), MPI_Testsome, + (int incount, MPI_Request requests[], + int *outcount, int *indices, + MPI_Status status[])); MPI_CALL(XBT_PUBLIC(int), MPI_Bcast, (void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm)); @@ -338,14 +375,23 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Alltoallv, void *recvbuf, int *recvcounts, int *recvdisps, MPI_Datatype recvtype, MPI_Comm comm)); +MPI_CALL(XBT_PUBLIC(int), MPI_Iprobe, + (int source, int tag, MPI_Comm comm, + int* flag, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC(int), MPI_Probe, + (int source, int tag, MPI_Comm comm, + MPI_Status* status)); + //FIXME: these are not yet implemented + typedef void MPI_Handler_function(MPI_Comm*, int*, ...); 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); +XBT_PUBLIC(MPI_Datatype) MPI_PACKED; 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)); @@ -368,19 +414,12 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Errhandler_free, (MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC(int), MPI_Errhandler_get, (MPI_Comm comm, MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC(int), MPI_Error_string, (int errorcode, char* string, int* resultlen)); MPI_CALL(XBT_PUBLIC(int), MPI_Errhandler_set, (MPI_Comm comm, MPI_Errhandler errhandler)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_contiguous, (int count, MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC(int), MPI_Cancel, (MPI_Request* request)); MPI_CALL(XBT_PUBLIC(int), MPI_Buffer_attach, (void* buffer, int size)); MPI_CALL(XBT_PUBLIC(int), MPI_Buffer_detach, (void* buffer, int* size)); -MPI_CALL(XBT_PUBLIC(int), MPI_Testsome, (int incount, MPI_Request* requests, int* outcount, int* indices, MPI_Status* statuses)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_test_inter, (MPI_Comm comm, int* flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Comm_get_attr, (MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Unpack, (void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_commit, (MPI_Datatype* datatype)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_hindexed, (int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_hvector, (int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* newtype)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_indexed, (int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* newtype)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_struct, (int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* newtype)); -MPI_CALL(XBT_PUBLIC(int), MPI_Type_vector, (int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC(int), MPI_Ssend, (void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm)); MPI_CALL(XBT_PUBLIC(int), MPI_Ssend_init, (void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC(int), MPI_Intercomm_create, (MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out)); @@ -391,7 +430,6 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Ibsend, (void* buf, int count, MPI_Datatype dataty MPI_CALL(XBT_PUBLIC(int), MPI_Comm_remote_group, (MPI_Comm comm, MPI_Group* group)); MPI_CALL(XBT_PUBLIC(int), MPI_Comm_remote_size, (MPI_Comm comm, int* size)); MPI_CALL(XBT_PUBLIC(int), MPI_Issend, (void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC(int), MPI_Probe, (int source, int tag, MPI_Comm comm, MPI_Status* status)); MPI_CALL(XBT_PUBLIC(int), MPI_Attr_delete, (MPI_Comm comm, int keyval)); MPI_CALL(XBT_PUBLIC(int), MPI_Attr_get, (MPI_Comm comm, int keyval, void* attr_value, int* flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Attr_put, (MPI_Comm comm, int keyval, void* attr_value)); @@ -402,11 +440,11 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Keyval_create, (MPI_Copy_function* copy_fn, MPI_De MPI_CALL(XBT_PUBLIC(int), MPI_Keyval_free, (int* keyval)); MPI_CALL(XBT_PUBLIC(int), MPI_Test_cancelled, (MPI_Status* status, int* flag)); MPI_CALL(XBT_PUBLIC(int), MPI_Pack, (void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm)); -MPI_CALL(XBT_PUBLIC(int), MPI_Testall, (int count, MPI_Request* requests, int* flag, MPI_Status* statuses)); MPI_CALL(XBT_PUBLIC(int), MPI_Get_elements, (MPI_Status* status, MPI_Datatype datatype, int* elements)); MPI_CALL(XBT_PUBLIC(int), MPI_Dims_create, (int nnodes, int ndims, int* dims)); -MPI_CALL(XBT_PUBLIC(int), MPI_Iprobe, (int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status)); MPI_CALL(XBT_PUBLIC(int), MPI_Initialized, (int* flag)); +MPI_CALL(XBT_PUBLIC(int), MPI_Pcontrol, (const int level )); + //FIXME: End of all the not yet implemented stuff // smpi functions @@ -418,11 +456,12 @@ XBT_PUBLIC(void) smpi_exit(int); XBT_PUBLIC(unsigned int) smpi_sleep(unsigned int secs); XBT_PUBLIC(int) smpi_gettimeofday(struct timeval *tv, struct timezone *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, - int iters, double threshold); + int iters, double threshold); XBT_PUBLIC(int) smpi_sample_2(int global, const char *file, int line); XBT_PUBLIC(void) smpi_sample_3(int global, const char *file, int line); -XBT_PUBLIC(void) smpi_sample_flops(double flops); #define SMPI_SAMPLE_LOCAL(iters,thres) for(smpi_sample_1(0, __FILE__, __LINE__, iters, thres); \ smpi_sample_2(0, __FILE__, __LINE__); \ @@ -432,7 +471,8 @@ XBT_PUBLIC(void) smpi_sample_flops(double flops); smpi_sample_2(1, __FILE__, __LINE__); \ smpi_sample_3(1, __FILE__, __LINE__)) -#define SMPI_SAMPLE_DELAY(flops) for(smpi_sample_flops(flops); 0; ) +#define SMPI_SAMPLE_DELAY(duration) for(smpi_execute(duration); 0; ) +#define SMPI_SAMPLE_FLOPS(flops) for(smpi_execute_flops(flops); 0; ) XBT_PUBLIC(void *) smpi_shared_malloc(size_t size, const char *file, int line); @@ -441,8 +481,22 @@ XBT_PUBLIC(void *) smpi_shared_malloc(size_t size, const char *file, XBT_PUBLIC(void) smpi_shared_free(void *data); #define SMPI_SHARED_FREE(data) smpi_shared_free(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__))) + /* Fortran specific stuff */ XBT_PUBLIC(int) MAIN__(void); +XBT_PUBLIC(int) smpi_process_index(void); + +/* 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); + SG_END_DECL() #endif