X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/488dda0c43d26f0a770e1d5b47f73148e153949b..d2d907185a41d4e59e9f4eaa7d42700ea9483140:/include/smpi/smpi.h diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index fb6259b880..309804ac9e 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -417,8 +417,8 @@ MPI_CALL(XBT_PUBLIC int, MPI_Free_mem, (void* base)); 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_Get_address, (void* location, MPI_Aint* address)); +MPI_CALL(XBT_PUBLIC int, MPI_Address, (const void* location, MPI_Aint* address)); +MPI_CALL(XBT_PUBLIC int, MPI_Get_address, (const void* location, MPI_Aint* address)); MPI_CALL(XBT_PUBLIC int, MPI_Error_class, (int errorcode, int* errorclass)); MPI_CALL(XBT_PUBLIC int, MPI_Attr_delete, (MPI_Comm comm, int keyval)); @@ -438,7 +438,7 @@ 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)); + (int count, const int* blocklens, const MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC int, MPI_Type_create_hindexed, (int count, const int* blocklens, const MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC int, MPI_Type_create_hindexed_block, @@ -454,7 +454,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Type_create_indexed, MPI_CALL(XBT_PUBLIC int, MPI_Type_create_indexed_block, (int count, int blocklength, const 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)); + (int count, const int* blocklens, const MPI_Aint* indices, const MPI_Datatype* old_types, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC int, MPI_Type_create_struct, (int count, const int* blocklens, const MPI_Aint* indices, const MPI_Datatype* old_types, MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC int, MPI_Type_vector, @@ -464,7 +464,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Type_create_resized, (MPI_Datatype oldtype, MPI_Aint lb, MPI_Aint extent, MPI_Datatype* newtype)); 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 int, MPI_Get_count, (MPI_Status * status, MPI_Datatype datatype, int* count)); +MPI_CALL(XBT_PUBLIC int, MPI_Get_count, (const MPI_Status * status, MPI_Datatype datatype, int* count)); MPI_CALL(XBT_PUBLIC int, MPI_Type_get_attr, (MPI_Datatype type, int type_keyval, void* attribute_val, int* flag)); MPI_CALL(XBT_PUBLIC int, MPI_Type_set_attr, (MPI_Datatype type, int type_keyval, void* att)); MPI_CALL(XBT_PUBLIC int, MPI_Type_delete_attr, (MPI_Datatype type, int comm_keyval)); @@ -473,7 +473,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Type_create_keyval, void* extra_state)); MPI_CALL(XBT_PUBLIC int, MPI_Type_free_keyval, (int* keyval)); MPI_CALL(XBT_PUBLIC int, MPI_Type_dup, (MPI_Datatype datatype, MPI_Datatype* newtype)); -MPI_CALL(XBT_PUBLIC int, MPI_Type_set_name, (MPI_Datatype datatype, char* name)); +MPI_CALL(XBT_PUBLIC int, MPI_Type_set_name, (MPI_Datatype datatype, const char* name)); MPI_CALL(XBT_PUBLIC int, MPI_Type_get_name, (MPI_Datatype datatype, char* name, int* len)); MPI_CALL(XBT_PUBLIC int, MPI_Pack, @@ -507,8 +507,9 @@ MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Group_c2f, (MPI_Group group)); 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_Comm_set_name, (MPI_Comm comm, char* name)); +MPI_CALL(XBT_PUBLIC int, MPI_Comm_set_name, (MPI_Comm comm, const char* name)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_dup, (MPI_Comm comm, MPI_Comm* newcomm)); +MPI_CALL(XBT_PUBLIC int, MPI_Comm_dup_with_info, (MPI_Comm comm, MPI_Info info, MPI_Comm* newcomm)); 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_Comm_set_attr, (MPI_Comm comm, int comm_keyval, void* attribute_val)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_delete_attr, (MPI_Comm comm, int comm_keyval)); @@ -523,6 +524,10 @@ MPI_CALL(XBT_PUBLIC int, MPI_Comm_create_group, (MPI_Comm comm, MPI_Group group, 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_Comm_set_info, (MPI_Comm comm, MPI_Info info)); +MPI_CALL(XBT_PUBLIC int, MPI_Comm_get_info, (MPI_Comm comm, MPI_Info* info)); +MPI_CALL(XBT_PUBLIC int, MPI_Comm_split_type, + (MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm* newcomm)); MPI_CALL(XBT_PUBLIC MPI_Comm, MPI_Comm_f2c, (MPI_Fint comm)); MPI_CALL(XBT_PUBLIC MPI_Fint, MPI_Comm_c2f, (MPI_Comm comm)); @@ -556,6 +561,7 @@ MPI_CALL(XBT_PUBLIC int, MPI_Testany, (int count, MPI_Request requests[], int* i MPI_CALL(XBT_PUBLIC int, MPI_Testall, (int count, MPI_Request* requests, int* flag, MPI_Status* statuses)); 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_Test_cancelled, (const MPI_Status * status, int* flag)); MPI_CALL(XBT_PUBLIC int, MPI_Wait, (MPI_Request * request, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_Waitany, (int count, MPI_Request requests[], int* index, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_Waitall, (int count, MPI_Request requests[], MPI_Status status[])); @@ -734,6 +740,47 @@ MPI_CALL(XBT_PUBLIC int, MPI_Grequest_start, MPI_CALL(XBT_PUBLIC int, MPI_Grequest_complete, (MPI_Request request)); MPI_CALL(XBT_PUBLIC int, MPI_Status_set_cancelled, (MPI_Status * status, int flag)); MPI_CALL(XBT_PUBLIC int, MPI_Status_set_elements, (MPI_Status * status, MPI_Datatype datatype, int count)); +MPI_CALL(XBT_PUBLIC int, MPI_Type_create_subarray, + (int ndims, const int* array_of_sizes, const int* array_of_subsizes, const int* array_of_starts, int order, MPI_Datatype oldtype, + MPI_Datatype* newtype)); + +MPI_CALL(XBT_PUBLIC int, MPI_File_open, (MPI_Comm comm, const char* filename, int amode, MPI_Info info, MPI_File* fh)); +MPI_CALL(XBT_PUBLIC int, MPI_File_close, (MPI_File * fh)); +MPI_CALL(XBT_PUBLIC int, MPI_File_delete, (const char* filename, MPI_Info info)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_size, (MPI_File fh, MPI_Offset* size)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_group, (MPI_File fh, MPI_Group* group)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_amode, (MPI_File fh, int* amode)); +MPI_CALL(XBT_PUBLIC int, MPI_File_set_info, (MPI_File fh, MPI_Info info)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_info, (MPI_File fh, MPI_Info* info_used)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_at, + (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all, + (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_at, + (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_at_all, + (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_all, + (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_all, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_seek, (MPI_File fh, MPI_Offset offset, int whenace)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_position, (MPI_File fh, MPI_Offset* offset)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_shared, + (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_shared, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_read_ordered, + (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered, + (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_File_seek_shared, (MPI_File fh, MPI_Offset offset, int whence)); +MPI_CALL(XBT_PUBLIC int, MPI_File_get_position_shared, (MPI_File fh, MPI_Offset* offset)); +MPI_CALL(XBT_PUBLIC int, MPI_File_sync, (MPI_File fh)); + //FIXME: these are not yet implemented @@ -822,7 +869,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_Rsend_init, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_Irsend, (const void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_Test_cancelled, (const MPI_Status * status, int* flag)); MPI_CALL(XBT_PUBLIC int, MPI_Get_elements, (MPI_Status * status, MPI_Datatype datatype, int* elements)); MPI_CALL(XBT_PUBLIC int, MPI_Pcontrol, (const int level, ...)); @@ -840,25 +886,17 @@ MPI_CALL(XBT_PUBLIC int, MPI_Pack_external, (char* datarep, void* inbuf, int inc void* outbuf, MPI_Aint outcount, MPI_Aint* position)); MPI_CALL(XBT_PUBLIC int, MPI_Unpack_external, (char* datarep, void* inbuf, MPI_Aint insize, MPI_Aint* position, void* outbuf, int outcount, MPI_Datatype datatype)); -MPI_CALL(XBT_PUBLIC int, MPI_Type_create_subarray, - (int ndims, const int* array_of_sizes, const int* array_of_subsizes, const int* array_of_starts, int order, MPI_Datatype oldtype, - MPI_Datatype* newtype)); MPI_CALL(XBT_PUBLIC int, MPI_Type_match_size, (int typeclass, int size, MPI_Datatype* datatype)); -MPI_CALL(XBT_PUBLIC int, MPI_Comm_set_info, (MPI_Comm comm, MPI_Info info)); -MPI_CALL(XBT_PUBLIC int, MPI_Comm_get_info, (MPI_Comm comm, MPI_Info* info)); -MPI_CALL(XBT_PUBLIC int, MPI_Comm_dup_with_info, (MPI_Comm comm, MPI_Info info, MPI_Comm* newcomm)); -MPI_CALL(XBT_PUBLIC int, MPI_Comm_split_type, - (MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm* newcomm)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_connect, - (char* port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm* newcomm)); + (const char* port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm* newcomm)); MPI_CALL(XBT_PUBLIC int, MPI_Unpublish_name, (char* service_name, MPI_Info info, char* port_name)); MPI_CALL(XBT_PUBLIC int, MPI_Publish_name, (char* service_name, MPI_Info info, char* port_name)); MPI_CALL(XBT_PUBLIC int, MPI_Lookup_name, (char* service_name, MPI_Info info, char* port_name)); MPI_CALL(XBT_PUBLIC int, MPI_Comm_join, (int fd, MPI_Comm* intercomm)); MPI_CALL(XBT_PUBLIC int, MPI_Open_port, (MPI_Info info, char* port_name)); -MPI_CALL(XBT_PUBLIC int, MPI_Close_port, (char* port_name)); -MPI_CALL(XBT_PUBLIC int, MPI_Comm_accept, (char* port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm* newcomm)); -MPI_CALL(XBT_PUBLIC int, MPI_Comm_spawn, (char* command, char** argv, int maxprocs, MPI_Info info, int root, +MPI_CALL(XBT_PUBLIC int, MPI_Close_port, (const char* port_name)); +MPI_CALL(XBT_PUBLIC int, MPI_Comm_accept, (const char* port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm* newcomm)); +MPI_CALL(XBT_PUBLIC int, MPI_Comm_spawn, (const char* command, char** argv, int maxprocs, MPI_Info info, int root, MPI_Comm comm, MPI_Comm* intercomm, int* array_of_errcodes)); 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, @@ -876,28 +914,12 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_create_errhandler, (MPI_File_errhandler_function * function, MPI_Errhandler* errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_errhandler, (MPI_File file, MPI_Errhandler errhandler)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_errhandler, (MPI_File file, MPI_Errhandler* errhandler)); -MPI_CALL(XBT_PUBLIC int, MPI_File_open, (MPI_Comm comm, const char* filename, int amode, MPI_Info info, MPI_File* fh)); -MPI_CALL(XBT_PUBLIC int, MPI_File_close, (MPI_File * fh)); -MPI_CALL(XBT_PUBLIC int, MPI_File_delete, (const char* filename, MPI_Info info)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_size, (MPI_File fh, MPI_Offset size)); MPI_CALL(XBT_PUBLIC int, MPI_File_preallocate, (MPI_File fh, MPI_Offset size)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_size, (MPI_File fh, MPI_Offset* size)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_group, (MPI_File fh, MPI_Group* group)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_amode, (MPI_File fh, int* amode)); -MPI_CALL(XBT_PUBLIC int, MPI_File_set_info, (MPI_File fh, MPI_Info info)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_info, (MPI_File fh, MPI_Info* info_used)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_view, (MPI_File fh, MPI_Offset disp, MPI_Datatype etype, MPI_Datatype filetype, const char* datarep, MPI_Info info)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_view, (MPI_File fh, MPI_Offset* disp, MPI_Datatype* etype, MPI_Datatype* filetype, char* datarep)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_at, - (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all, - (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_at, - (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_at_all, - (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_File_iread_at, (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_at, @@ -906,13 +928,6 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_iread_at_all, (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_at_all, (MPI_File fh, MPI_Offset offset, const void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_all, - (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_all, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_File_iread, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite, @@ -921,23 +936,11 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_iread_all, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_all, (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_File_seek, (MPI_File fh, MPI_Offset offset, int whenace)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_position, (MPI_File fh, MPI_Offset* offset)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_byte_offset, (MPI_File fh, MPI_Offset offset, MPI_Offset* disp)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_shared, - (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_shared, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_File_iread_shared, (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); MPI_CALL(XBT_PUBLIC int, MPI_File_iwrite_shared, (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Request* request)); -MPI_CALL(XBT_PUBLIC int, MPI_File_read_ordered, - (MPI_File fh, void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered, - (MPI_File fh, const void* buf, int count, MPI_Datatype datatype, MPI_Status* status)); -MPI_CALL(XBT_PUBLIC int, MPI_File_seek_shared, (MPI_File fh, MPI_Offset offset, int whence)); -MPI_CALL(XBT_PUBLIC int, MPI_File_get_position_shared, (MPI_File fh, MPI_Offset* offset)); MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all_begin, (MPI_File fh, MPI_Offset offset, void* buf, int count, MPI_Datatype datatype)); MPI_CALL(XBT_PUBLIC int, MPI_File_read_at_all_end, (MPI_File fh, void* buf, MPI_Status* status)); @@ -955,9 +958,10 @@ MPI_CALL(XBT_PUBLIC int, MPI_File_write_ordered_end, (MPI_File fh, const void* b MPI_CALL(XBT_PUBLIC int, MPI_File_get_type_extent, (MPI_File fh, MPI_Datatype datatype, MPI_Aint* extent)); MPI_CALL(XBT_PUBLIC int, MPI_File_set_atomicity, (MPI_File fh, int flag)); MPI_CALL(XBT_PUBLIC int, MPI_File_get_atomicity, (MPI_File fh, int* flag)); -MPI_CALL(XBT_PUBLIC int, MPI_File_sync, (MPI_File fh)); MPI_CALL(XBT_PUBLIC int, MPI_Mrecv, (void* buf, int count, MPI_Datatype datatype, MPI_Message* message, MPI_Status* status)); MPI_CALL(XBT_PUBLIC int, MPI_Mprobe, (int source, int tag, MPI_Comm comm, MPI_Message* message, MPI_Status* status)); +MPI_CALL(XBT_PUBLIC int, MPI_Imrecv, (void* buf, int count, MPI_Datatype datatype, MPI_Message* message, MPI_Request *request)); +MPI_CALL(XBT_PUBLIC int, MPI_Improbe, (int source, int tag, MPI_Comm comm, int *flag, MPI_Message* message, MPI_Status* status)); //FIXME: End of all the not yet implemented stuff // smpi functions @@ -971,16 +975,6 @@ XBT_PUBLIC void smpi_execute_flops(double flops); XBT_PUBLIC void smpi_execute(double duration); XBT_PUBLIC void smpi_execute_benched(double duration); -// PLEASE NOTE: If you remove these functions, the entire smpi_dvfs.cpp file can be removed as well!! -XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_pstate_speed(sg_host_self(), pstate_index) instead") XBT_PUBLIC double smpi_get_host_power_peak_at(int pstate_index); -XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_speed(sg_host_self()) instead") XBT_PUBLIC double smpi_get_host_current_power_peak(); -XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_nb_pstates(sg_host_self()) instead") XBT_PUBLIC int smpi_get_host_nb_pstates(); -XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_set_pstate(sg_host_self(), pstate_index) instead") XBT_PUBLIC void smpi_set_host_pstate(int pstate_index); -XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_pstate(sg_host_self()) instead") XBT_PUBLIC int smpi_get_host_pstate(); - -XBT_ATTRIB_DEPRECATED_v324("Please use sg_host_get_consumed_energy(sg_host_self()) instead") XBT_PUBLIC double smpi_get_host_consumed_energy(); - - XBT_PUBLIC unsigned long long smpi_rastro_resolution(); XBT_PUBLIC unsigned long long smpi_rastro_timestamp(); XBT_PUBLIC void smpi_sample_1(int global, const char* file, int line, int iters, double threshold);