X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/baebdceda7d5a8232effba9ace34c0c6c1dadac3..a838f0478afad51d7d1c956c49cc5a998723ebab:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 830e6c51f5..30714256c9 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 @@ -67,6 +71,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; @@ -157,7 +162,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)); @@ -208,6 +213,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 +226,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, @@ -338,6 +345,12 @@ 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*, ...); @@ -391,7 +404,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)); @@ -405,7 +417,6 @@ MPI_CALL(XBT_PUBLIC(int), MPI_Pack, (void* inbuf, int incount, MPI_Datatype type 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)); //FIXME: End of all the not yet implemented stuff @@ -418,21 +429,23 @@ 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 max); + 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(num) for(smpi_sample_1(0, __FILE__, __LINE__, num); \ - smpi_sample_2(0, __FILE__, __LINE__); \ - smpi_sample_3(0, __FILE__, __LINE__)) +#define SMPI_SAMPLE_LOCAL(iters,thres) for(smpi_sample_1(0, __FILE__, __LINE__, iters, thres); \ + smpi_sample_2(0, __FILE__, __LINE__); \ + smpi_sample_3(0, __FILE__, __LINE__)) -#define SMPI_SAMPLE_GLOBAL(num) for(smpi_sample_1(1, __FILE__, __LINE__, num); \ - smpi_sample_2(1, __FILE__, __LINE__); \ - smpi_sample_3(1, __FILE__, __LINE__)) +#define SMPI_SAMPLE_GLOBAL(iters,thres) for(smpi_sample_1(1, __FILE__, __LINE__, iters, thres); \ + 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 +454,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