X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c34ec0a9a237bf4befb762e35ab117731a8c3851..1b791d40a387d97aebc05cf4dd0b5760777de150:/src/smpi/bindings/smpi_f77.cpp diff --git a/src/smpi/bindings/smpi_f77.cpp b/src/smpi/bindings/smpi_f77.cpp index ad939dad67..0cd960050a 100644 --- a/src/smpi/bindings/smpi_f77.cpp +++ b/src/smpi/bindings/smpi_f77.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,99 +7,111 @@ #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_errhandler.hpp" +#include "smpi_file.hpp" #include "smpi_op.hpp" #include "smpi_request.hpp" #include "smpi_win.hpp" #include "src/smpi/include/smpi_actor.hpp" +#include + static int running_processes = 0; -void smpi_init_fortran_types(){ - if(simgrid::smpi::F2C::lookup() == nullptr){ - MPI_COMM_WORLD->add_f(); - MPI_BYTE->add_f();//MPI_BYTE - MPI_CHAR->add_f();//MPI_CHARACTER - if(sizeof(void*)==8) { - MPI_C_BOOL->add_f();//MPI_LOGICAL - MPI_INT->add_f();//MPI_INTEGER - } else { - MPI_C_BOOL->add_f();//MPI_LOGICAL - MPI_LONG->add_f();//MPI_INTEGER - } - MPI_INT8_T->add_f();//MPI_INTEGER1 - MPI_INT16_T->add_f();//MPI_INTEGER2 - MPI_INT32_T->add_f();//MPI_INTEGER4 - MPI_INT64_T->add_f();//MPI_INTEGER8 - MPI_REAL->add_f();//MPI_REAL - MPI_REAL4->add_f();//MPI_REAL4 - MPI_REAL8->add_f();//MPI_REAL8 - MPI_DOUBLE->add_f();//MPI_DOUBLE_PRECISION - MPI_COMPLEX8->add_f();//MPI_COMPLEX - MPI_COMPLEX16->add_f();//MPI_DOUBLE_COMPLEX - if(sizeof(void*)==8) - MPI_2INT->add_f();//MPI_2INTEGER - else - MPI_2LONG->add_f();//MPI_2INTEGER - MPI_UINT8_T->add_f();//MPI_LOGICAL1 - MPI_UINT16_T->add_f();//MPI_LOGICAL2 - MPI_UINT32_T->add_f();//MPI_LOGICAL4 - MPI_UINT64_T->add_f();//MPI_LOGICAL8 - MPI_2FLOAT->add_f();//MPI_2REAL - MPI_2DOUBLE->add_f();//MPI_2DOUBLE_PRECISION - MPI_PTR->add_f();//MPI_AINT - MPI_OFFSET->add_f();//MPI_OFFSET - MPI_AINT->add_f();//MPI_COUNT - MPI_REAL16->add_f();//MPI_REAL16 - MPI_PACKED->add_f();//MPI_PACKED - MPI_COMPLEX8->add_f();//MPI_COMPLEX8 - MPI_COMPLEX16->add_f();//MPI_COMPLEX16 - MPI_COMPLEX32->add_f();//MPI_COMPLEX32 - - MPI_MAX->add_f(); - MPI_MIN->add_f(); - MPI_MAXLOC->add_f(); - MPI_MINLOC->add_f(); - MPI_SUM->add_f(); - MPI_PROD->add_f(); - MPI_LAND->add_f(); - MPI_LOR->add_f(); - MPI_LXOR->add_f(); - MPI_BAND->add_f(); - MPI_BOR->add_f(); - MPI_BXOR->add_f(); - - MPI_ERRORS_RETURN->add_f(); - MPI_ERRORS_ARE_FATAL->add_f(); - } +void smpi_init_fortran_types() +{ + if (simgrid::smpi::F2C::lookup() == nullptr) { + MPI_COMM_WORLD->add_f(); + MPI_BYTE->add_f(); // MPI_BYTE + MPI_CHAR->add_f(); // MPI_CHARACTER + MPI_C_BOOL->add_f(); // MPI_LOGICAL + if (sizeof(void*) == 8) { + MPI_INT->add_f(); // MPI_INTEGER + } else { + MPI_LONG->add_f(); // MPI_INTEGER + } + MPI_INT8_T->add_f(); // MPI_INTEGER1 + MPI_INT16_T->add_f(); // MPI_INTEGER2 + MPI_INT32_T->add_f(); // MPI_INTEGER4 + MPI_INT64_T->add_f(); // MPI_INTEGER8 + MPI_REAL->add_f(); // MPI_REAL + MPI_REAL4->add_f(); // MPI_REAL4 + MPI_REAL8->add_f(); // MPI_REAL8 + MPI_DOUBLE->add_f(); // MPI_DOUBLE_PRECISION + MPI_COMPLEX8->add_f(); // MPI_COMPLEX + MPI_COMPLEX16->add_f(); // MPI_DOUBLE_COMPLEX + if (sizeof(void*) == 8) + MPI_2INT->add_f(); // MPI_2INTEGER + else + MPI_2LONG->add_f(); // MPI_2INTEGER + MPI_UINT8_T->add_f(); // MPI_LOGICAL1 + MPI_UINT16_T->add_f(); // MPI_LOGICAL2 + MPI_UINT32_T->add_f(); // MPI_LOGICAL4 + MPI_UINT64_T->add_f(); // MPI_LOGICAL8 + MPI_2FLOAT->add_f(); // MPI_2REAL + MPI_2DOUBLE->add_f(); // MPI_2DOUBLE_PRECISION + MPI_PTR->add_f(); // MPI_AINT + MPI_OFFSET->add_f(); // MPI_OFFSET + MPI_AINT->add_f(); // MPI_COUNT + MPI_REAL16->add_f(); // MPI_REAL16 + MPI_PACKED->add_f(); // MPI_PACKED + MPI_COMPLEX8->add_f(); // MPI_COMPLEX8 + MPI_COMPLEX16->add_f(); // MPI_COMPLEX16 + MPI_COMPLEX32->add_f(); // MPI_COMPLEX32 + + MPI_MAX->add_f(); + MPI_MIN->add_f(); + MPI_MAXLOC->add_f(); + MPI_MINLOC->add_f(); + MPI_SUM->add_f(); + MPI_PROD->add_f(); + MPI_LAND->add_f(); + MPI_LOR->add_f(); + MPI_LXOR->add_f(); + MPI_BAND->add_f(); + MPI_BOR->add_f(); + MPI_BXOR->add_f(); + + MPI_ERRORS_RETURN->add_f(); + MPI_ERRORS_ARE_FATAL->add_f(); + + MPI_LB->add_f(); + MPI_UB->add_f(); + simgrid::smpi::F2C::finish_initialization(); + } } extern "C" { // This should really use the C linkage to be usable from Fortran - -void mpi_init_(int* ierr) { - smpi_init_fortran_types(); - *ierr = MPI_Init(nullptr, nullptr); - running_processes++; +void mpi_init_(int* ierr) +{ + smpi_init_fortran_types(); + *ierr = MPI_Init(nullptr, nullptr); + running_processes++; } -void mpi_finalize_(int* ierr) { - *ierr = MPI_Finalize(); - running_processes--; +void mpi_finalize_(int* ierr) +{ + *ierr = MPI_Finalize(); + running_processes--; } -void mpi_abort_(int* comm, int* errorcode, int* ierr) { +void mpi_abort_(int* comm, int* errorcode, int* ierr) +{ *ierr = MPI_Abort(simgrid::smpi::Comm::f2c(*comm), *errorcode); } -double mpi_wtime_() { - return MPI_Wtime(); +double mpi_wtime_() +{ + return MPI_Wtime(); } -double mpi_wtick_() { +double mpi_wtick_() +{ return MPI_Wtick(); } -void mpi_group_incl_(int* group, int* n, int* ranks, int* group_out, int* ierr) { +void mpi_group_incl_(int* group, int* n, int* ranks, int* group_out, int* ierr) +{ MPI_Group tmp; *ierr = MPI_Group_incl(simgrid::smpi::Group::f2c(*group), *n, ranks, &tmp); @@ -108,68 +120,78 @@ void mpi_group_incl_(int* group, int* n, int* ranks, int* group_out, int* ierr) } } -void mpi_initialized_(int* flag, int* ierr){ +void mpi_initialized_(int* flag, int* ierr) +{ *ierr = MPI_Initialized(flag); } -void mpi_get_processor_name_(char *name, int *resultlen, int* ierr){ +void mpi_get_processor_name_(char* name, int* resultlen, int* ierr) +{ //fortran does not handle string endings cleanly, so initialize everything before memset(name, 0, MPI_MAX_PROCESSOR_NAME); *ierr = MPI_Get_processor_name(name, resultlen); } -void mpi_get_count_(MPI_Status * status, int* datatype, int *count, int* ierr){ +void mpi_get_count_(MPI_Status* status, int* datatype, int* count, int* ierr) +{ *ierr = MPI_Get_count(FORT_STATUS_IGNORE(status), simgrid::smpi::Datatype::f2c(*datatype), count); } -void mpi_attr_get_(int* comm, int* keyval, int* attr_value, int* flag, int* ierr ){ +void mpi_attr_get_(int* comm, int* keyval, int* attr_value, int* flag, int* ierr) +{ int* value = nullptr; *ierr = MPI_Attr_get(simgrid::smpi::Comm::f2c(*comm), *keyval, &value, flag); if(*flag == 1) *attr_value=*value; } -void mpi_error_string_(int* errorcode, char* string, int* resultlen, int* ierr){ +void mpi_error_string_(int* errorcode, char* string, int* resultlen, int* ierr) +{ *ierr = MPI_Error_string(*errorcode, string, resultlen); } -void mpi_win_fence_( int* assert, int* win, int* ierr){ +void mpi_win_fence_(int* assert, int* win, int* ierr) +{ *ierr = MPI_Win_fence(* assert, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_free_( int* win, int* ierr){ +void mpi_win_free_(int* win, int* ierr) +{ MPI_Win tmp = simgrid::smpi::Win::f2c(*win); *ierr = MPI_Win_free(&tmp); - if(*ierr == MPI_SUCCESS) { - simgrid::smpi::F2C::free_f(*win); - } } -void mpi_win_create_( int *base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int *win, int* ierr){ +void mpi_win_create_(int* base, MPI_Aint* size, int* disp_unit, int* info, int* comm, int* win, int* ierr) +{ MPI_Win tmp; *ierr = MPI_Win_create( static_cast(base), *size, *disp_unit, simgrid::smpi::Info::f2c(*info), simgrid::smpi::Comm::f2c(*comm),&tmp); - if(*ierr == MPI_SUCCESS) { - *win = tmp->add_f(); - } + if (*ierr == MPI_SUCCESS) { + *win = tmp->c2f(); + } } -void mpi_win_post_(int* group, int assert, int* win, int* ierr){ +void mpi_win_post_(int* group, int assert, int* win, int* ierr) +{ *ierr = MPI_Win_post(simgrid::smpi::Group::f2c(*group), assert, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_start_(int* group, int assert, int* win, int* ierr){ +void mpi_win_start_(int* group, int assert, int* win, int* ierr) +{ *ierr = MPI_Win_start(simgrid::smpi::Group::f2c(*group), assert, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_complete_(int* win, int* ierr){ +void mpi_win_complete_(int* win, int* ierr) +{ *ierr = MPI_Win_complete(simgrid::smpi::Win::f2c(*win)); } -void mpi_win_wait_(int* win, int* ierr){ +void mpi_win_wait_(int* win, int* ierr) +{ *ierr = MPI_Win_wait(simgrid::smpi::Win::f2c(*win)); } -void mpi_win_set_name_ (int* win, char * name, int* ierr, int size){ +void mpi_win_set_name_(int* win, char* name, int* ierr, int size) +{ //handle trailing blanks while(name[size-1]==' ') size--; @@ -177,118 +199,138 @@ void mpi_win_set_name_ (int* win, char * name, int* ierr, int size){ size--; name++; } - char* tname = xbt_new(char,size+1); - strncpy(tname, name, size); - tname[size]='\0'; - *ierr = MPI_Win_set_name(simgrid::smpi::Win::f2c(*win), tname); - xbt_free(tname); + std::string tname(name, size); + *ierr = MPI_Win_set_name(simgrid::smpi::Win::f2c(*win), tname.c_str()); } -void mpi_win_get_name_ (int* win, char * name, int* len, int* ierr){ +void mpi_win_get_name_(int* win, char* name, int* len, int* ierr) +{ *ierr = MPI_Win_get_name(simgrid::smpi::Win::f2c(*win),name,len); if(*len>0) name[*len]=' ';//blank padding, not \0 } -void mpi_win_allocate_( MPI_Aint* size, int* disp_unit, int* info, int* comm, void* base, int* win, int* ierr){ +void mpi_win_allocate_(MPI_Aint* size, int* disp_unit, int* info, int* comm, void* base, int* win, int* ierr) +{ MPI_Win tmp; - *ierr = MPI_Win_allocate( *size, *disp_unit, simgrid::smpi::Info::f2c(*info), simgrid::smpi::Comm::f2c(*comm),static_cast(base),&tmp); + *ierr = + MPI_Win_allocate(*size, *disp_unit, simgrid::smpi::Info::f2c(*info), simgrid::smpi::Comm::f2c(*comm), base, &tmp); if(*ierr == MPI_SUCCESS) { - *win = tmp->add_f(); + *win = tmp->c2f(); } } -void mpi_win_attach_(int* win, int* base, MPI_Aint* size, int* ierr){ +void mpi_win_attach_(int* win, int* base, MPI_Aint* size, int* ierr) +{ *ierr = MPI_Win_attach(simgrid::smpi::Win::f2c(*win), static_cast(base), *size); } -void mpi_win_create_dynamic_( int* info, int* comm, int *win, int* ierr){ +void mpi_win_create_dynamic_(int* info, int* comm, int* win, int* ierr) +{ MPI_Win tmp; *ierr = MPI_Win_create_dynamic( simgrid::smpi::Info::f2c(*info), simgrid::smpi::Comm::f2c(*comm),&tmp); if(*ierr == MPI_SUCCESS) { - *win = tmp->add_f(); + *win = tmp->c2f(); } } -void mpi_win_detach_(int* win, int* base, int* ierr){ +void mpi_win_detach_(int* win, int* base, int* ierr) +{ *ierr = MPI_Win_detach(simgrid::smpi::Win::f2c(*win), static_cast(base)); } -void mpi_win_set_info_(int* win, int* info, int* ierr){ +void mpi_win_set_info_(int* win, int* info, int* ierr) +{ *ierr = MPI_Win_set_info(simgrid::smpi::Win::f2c(*win), simgrid::smpi::Info::f2c(*info)); } -void mpi_win_get_info_(int* win, int* info, int* ierr){ +void mpi_win_get_info_(int* win, int* info, int* ierr) +{ MPI_Info tmp; *ierr = MPI_Win_get_info(simgrid::smpi::Win::f2c(*win), &tmp); - if(*ierr == MPI_SUCCESS) { - *info = tmp->add_f(); - } + if (*ierr == MPI_SUCCESS) { + *info = tmp->c2f(); + } } -void mpi_win_get_group_(int* win, int* group, int* ierr){ +void mpi_win_get_group_(int* win, int* group, int* ierr) +{ MPI_Group tmp; *ierr = MPI_Win_get_group(simgrid::smpi::Win::f2c(*win), &tmp); - if(*ierr == MPI_SUCCESS) { - *group = tmp->add_f(); - } + if (*ierr == MPI_SUCCESS) { + *group = tmp->c2f(); + } } -void mpi_win_get_attr_(int* win, int* type_keyval, MPI_Aint* attribute_val, int* flag, int* ierr){ - MPI_Aint* value = nullptr; - *ierr = MPI_Win_get_attr(simgrid::smpi::Win::f2c(*win), *type_keyval, &value, flag); +void mpi_win_get_attr_(int* win, int* win_keyval, MPI_Aint* attribute_val, int* flag, int* ierr) +{ + MPI_Aint* value = nullptr; + *ierr = MPI_Win_get_attr(simgrid::smpi::Win::f2c(*win), *win_keyval, &value, flag); if (*flag == 1) *attribute_val = *value; } -void mpi_win_set_attr_(int* win, int* type_keyval, MPI_Aint* att, int* ierr){ - MPI_Aint* val = (MPI_Aint*)xbt_malloc(sizeof(MPI_Aint)); - *val=*att; - *ierr = MPI_Win_set_attr(simgrid::smpi::Win::f2c(*win), *type_keyval, val); +void mpi_win_set_attr_(int* win, int* win_keyval, MPI_Aint* att, int* ierr) +{ + auto* val = xbt_new(MPI_Aint, 1); + *val = *att; + *ierr = MPI_Win_set_attr(simgrid::smpi::Win::f2c(*win), *win_keyval, val); } -void mpi_win_delete_attr_(int* win, int* comm_keyval, int* ierr){ - *ierr = MPI_Win_delete_attr (simgrid::smpi::Win::f2c(*win), *comm_keyval); +void mpi_win_delete_attr_(int* win, int* win_keyval, int* ierr) +{ + *ierr = MPI_Win_delete_attr(simgrid::smpi::Win::f2c(*win), *win_keyval); } -void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr){ +void mpi_win_create_keyval_(void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr) +{ smpi_copy_fn _copy_fn={nullptr,nullptr,nullptr,nullptr,nullptr,(*(int*)copy_fn) == 0 ? nullptr : reinterpret_cast(copy_fn)}; smpi_delete_fn _delete_fn={nullptr,nullptr,nullptr,nullptr,nullptr,(*(int*)delete_fn) == 0 ? nullptr : reinterpret_cast(delete_fn)}; - *ierr = simgrid::smpi::Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state); + *ierr = simgrid::smpi::Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state, true); } -void mpi_win_free_keyval_(int* keyval, int* ierr){ +void mpi_win_free_keyval_(int* keyval, int* ierr) +{ *ierr = MPI_Win_free_keyval( keyval); } -void mpi_win_lock_(int* lock_type, int* rank, int* assert, int* win, int* ierr){ +void mpi_win_lock_(int* lock_type, int* rank, int* assert, int* win, int* ierr) +{ *ierr = MPI_Win_lock(*lock_type, *rank, *assert, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_lock_all_(int* assert, int* win, int* ierr){ +void mpi_win_lock_all_(int* assert, int* win, int* ierr) +{ *ierr = MPI_Win_lock_all(*assert, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_unlock_(int* rank, int* win, int* ierr){ +void mpi_win_unlock_(int* rank, int* win, int* ierr) +{ *ierr = MPI_Win_unlock(*rank, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_unlock_all_(int* win, int* ierr){ +void mpi_win_unlock_all_(int* win, int* ierr) +{ *ierr = MPI_Win_unlock_all(simgrid::smpi::Win::f2c(*win)); } -void mpi_win_flush_(int* rank, int* win, int* ierr){ +void mpi_win_flush_(int* rank, int* win, int* ierr) +{ *ierr = MPI_Win_flush(*rank, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_flush_local_(int* rank, int* win, int* ierr){ +void mpi_win_flush_local_(int* rank, int* win, int* ierr) +{ *ierr = MPI_Win_flush_local(*rank, simgrid::smpi::Win::f2c(*win)); } -void mpi_win_flush_all_(int* win, int* ierr){ + +void mpi_win_flush_all_(int* win, int* ierr) +{ *ierr = MPI_Win_flush_all(simgrid::smpi::Win::f2c(*win)); } -void mpi_win_flush_local_all_(int* win, int* ierr){ +void mpi_win_flush_local_all_(int* win, int* ierr) +{ *ierr = MPI_Win_flush_local_all(simgrid::smpi::Win::f2c(*win)); } @@ -307,15 +349,17 @@ void mpi_win_dup_fn_(int* /*win*/, int* /*keyval*/, int* /*extrastate*/, MPI_Ain *ierr=MPI_SUCCESS; } -void mpi_info_create_( int *info, int* ierr){ +void mpi_info_create_(int* info, int* ierr) +{ MPI_Info tmp; *ierr = MPI_Info_create(&tmp); if(*ierr == MPI_SUCCESS) { - *info = tmp->add_f(); + *info = tmp->c2f(); } } -void mpi_info_set_( int *info, char *key, char *value, int* ierr, unsigned int keylen, unsigned int valuelen){ +void mpi_info_set_(int* info, char* key, char* value, int* ierr, unsigned int keylen, unsigned int valuelen) +{ //handle trailing blanks while(key[keylen-1]==' ') keylen--; @@ -323,9 +367,7 @@ void mpi_info_set_( int *info, char *key, char *value, int* ierr, unsigned int k keylen--; key++; } - char* tkey = xbt_new(char,keylen+1); - strncpy(tkey, key, keylen); - tkey[keylen]='\0'; + std::string tkey(key, keylen); while(value[valuelen-1]==' ') valuelen--; @@ -333,31 +375,24 @@ void mpi_info_set_( int *info, char *key, char *value, int* ierr, unsigned int k valuelen--; value++; } - char* tvalue = xbt_new(char,valuelen+1); - strncpy(tvalue, value, valuelen); - tvalue[valuelen]='\0'; + std::string tvalue(value, valuelen); - *ierr = MPI_Info_set( simgrid::smpi::Info::f2c(*info), tkey, tvalue); - xbt_free(tkey); - xbt_free(tvalue); + *ierr = MPI_Info_set(simgrid::smpi::Info::f2c(*info), tkey.c_str(), tvalue.c_str()); } -void mpi_info_get_ (int* info,char *key,int* valuelen, char *value, int *flag, int* ierr, unsigned int keylen ){ +void mpi_info_get_(int* info, char* key, int* valuelen, char* value, int* flag, int* ierr, unsigned int keylen) +{ while(key[keylen-1]==' ') keylen--; while(*key==' '){//handle leading blanks keylen--; key++; } - char* tkey = xbt_new(char,keylen+1); - strncpy(tkey, key, keylen); - tkey[keylen]='\0'; - *ierr = MPI_Info_get(simgrid::smpi::Info::f2c(*info),tkey,*valuelen, value, flag); - xbt_free(tkey); + std::string tkey(key, keylen); + *ierr = MPI_Info_get(simgrid::smpi::Info::f2c(*info), tkey.c_str(), *valuelen, value, flag); if(*flag!=0){ int replace=0; - int i=0; - for (i=0; i<*valuelen; i++){ + for (int i = 0; i < *valuelen; i++) { if(value[i]=='\0') replace=1; if(replace) @@ -366,7 +401,8 @@ void mpi_info_get_ (int* info,char *key,int* valuelen, char *value, int *flag, i } } -void mpi_info_free_(int* info, int* ierr){ +void mpi_info_free_(int* info, int* ierr) +{ MPI_Info tmp = simgrid::smpi::Info::f2c(*info); *ierr = MPI_Info_free(&tmp); if(*ierr == MPI_SUCCESS) { @@ -374,55 +410,64 @@ void mpi_info_free_(int* info, int* ierr){ } } -void mpi_get_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank, - MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* win, int* ierr){ +void mpi_get_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* tarsmpi_type_f2c, int* win, int* ierr) +{ *ierr = MPI_Get( static_cast(origin_addr),*origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype),*target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*tarsmpi_type_f2c), simgrid::smpi::Win::f2c(*win)); } -void mpi_rget_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank, - MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* win, int* request, int* ierr){ +void mpi_rget_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* tarsmpi_type_f2c, int* win, int* request, int* ierr) +{ MPI_Request req; *ierr = MPI_Rget( static_cast(origin_addr),*origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype),*target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*tarsmpi_type_f2c), simgrid::smpi::Win::f2c(*win), &req); if(*ierr == MPI_SUCCESS) { - *request = req->add_f(); + *request = req->c2f(); } } -void mpi_accumulate_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank, - MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* op, int* win, int* ierr){ +void mpi_accumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* tarsmpi_type_f2c, int* op, int* win, int* ierr) +{ *ierr = MPI_Accumulate( static_cast(origin_addr),*origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype),*target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*tarsmpi_type_f2c), simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win)); } -void mpi_raccumulate_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank, - MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* op, int* win, int* request, int* ierr){ +void mpi_raccumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, + MPI_Aint* target_disp, int* target_count, int* tarsmpi_type_f2c, int* op, int* win, int* request, + int* ierr) +{ MPI_Request req; *ierr = MPI_Raccumulate( static_cast(origin_addr),*origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype),*target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*tarsmpi_type_f2c), simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win),&req); if(*ierr == MPI_SUCCESS) { - *request = req->add_f(); + *request = req->c2f(); } } -void mpi_put_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank, - MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* win, int* ierr){ +void mpi_put_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* tarsmpi_type_f2c, int* win, int* ierr) +{ *ierr = MPI_Put( static_cast(origin_addr),*origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype),*target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*tarsmpi_type_f2c), simgrid::smpi::Win::f2c(*win)); } -void mpi_rput_( int *origin_addr, int* origin_count, int* origin_datatype, int *target_rank, - MPI_Aint* target_disp, int *target_count, int* tarsmpi_type_f2c, int* win, int* request, int* ierr){ +void mpi_rput_(int* origin_addr, int* origin_count, int* origin_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* tarsmpi_type_f2c, int* win, int* request, int* ierr) +{ MPI_Request req; *ierr = MPI_Rput( static_cast(origin_addr),*origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype),*target_rank, *target_disp, *target_count, simgrid::smpi::Datatype::f2c(*tarsmpi_type_f2c), simgrid::smpi::Win::f2c(*win),&req); if(*ierr == MPI_SUCCESS) { - *request = req->add_f(); + *request = req->c2f(); } } -void mpi_fetch_and_op_( int *origin_addr, int* result_addr, int* datatype, int* target_rank, MPI_Aint* target_disp, int* op, int* win, int* ierr){ +void mpi_fetch_and_op_(int* origin_addr, int* result_addr, int* datatype, int* target_rank, MPI_Aint* target_disp, + int* op, int* win, int* ierr) +{ *ierr = MPI_Fetch_and_op( static_cast(origin_addr), static_cast(result_addr), simgrid::smpi::Datatype::f2c(*datatype),*target_rank, *target_disp, simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win)); @@ -436,9 +481,10 @@ void mpi_compare_and_swap_(int* origin_addr, int* compare_addr, int* result_addr *target_disp, simgrid::smpi::Win::f2c(*win)); } -void mpi_get_accumulate_(int *origin_addr, int* origin_count, int* origin_datatype, int* result_addr, - int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, - int* target_datatype, int* op, int* win, int* ierr){ +void mpi_get_accumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* result_addr, int* result_count, + int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, + int* target_datatype, int* op, int* win, int* ierr) +{ *ierr = MPI_Get_accumulate(static_cast(origin_addr), *origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype), static_cast(result_addr), *result_count, simgrid::smpi::Datatype::f2c(*result_datatype), @@ -446,9 +492,10 @@ void mpi_get_accumulate_(int *origin_addr, int* origin_count, int* origin_dataty simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win)); } -void mpi_rget_accumulate_(int *origin_addr, int* origin_count, int* origin_datatype, int* result_addr, - int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, int* target_count, - int* target_datatype, int* op, int* win, int* request, int* ierr){ +void mpi_rget_accumulate_(int* origin_addr, int* origin_count, int* origin_datatype, int* result_addr, + int* result_count, int* result_datatype, int* target_rank, MPI_Aint* target_disp, + int* target_count, int* target_datatype, int* op, int* win, int* request, int* ierr) +{ MPI_Request req; *ierr = MPI_Rget_accumulate(static_cast(origin_addr), *origin_count, simgrid::smpi::Datatype::f2c(*origin_datatype), static_cast(result_addr), @@ -456,134 +503,138 @@ void mpi_rget_accumulate_(int *origin_addr, int* origin_count, int* origin_datat *target_count, simgrid::smpi::Datatype::f2c(*target_datatype), simgrid::smpi::Op::f2c(*op), simgrid::smpi::Win::f2c(*win), &req); if(*ierr == MPI_SUCCESS) { - *request = req->add_f(); + *request = req->c2f(); } } //following are automatically generated, and have to be checked -void mpi_finalized_ (int * flag, int* ierr){ - *ierr = MPI_Finalized(flag); +void mpi_finalized_(int* flag, int* ierr) +{ + *ierr = MPI_Finalized(flag); } -void mpi_init_thread_ (int* required, int *provided, int* ierr){ +void mpi_init_thread_(int* required, int* provided, int* ierr) +{ smpi_init_fortran_types(); *ierr = MPI_Init_thread(nullptr, nullptr,*required, provided); running_processes++; } -void mpi_query_thread_ (int *provided, int* ierr){ - *ierr = MPI_Query_thread(provided); +void mpi_query_thread_(int* provided, int* ierr) +{ + *ierr = MPI_Query_thread(provided); } -void mpi_is_thread_main_ (int *flag, int* ierr){ - - *ierr = MPI_Is_thread_main(flag); +void mpi_is_thread_main_(int* flag, int* ierr) +{ + *ierr = MPI_Is_thread_main(flag); } -void mpi_address_ (void *location, MPI_Aint * address, int* ierr){ - - *ierr = MPI_Address(location, address); +void mpi_address_(void* location, MPI_Aint* address, int* ierr) +{ + *ierr = MPI_Address(location, address); } -void mpi_get_address_ (void *location, MPI_Aint * address, int* ierr){ - - *ierr = MPI_Get_address(location, address); +void mpi_get_address_(void* location, MPI_Aint* address, int* ierr) +{ + *ierr = MPI_Get_address(location, address); } -void mpi_pcontrol_ (int* level , int* ierr){ - *ierr = MPI_Pcontrol(*static_cast(level)); +void mpi_pcontrol_(int* level, int* ierr) +{ + *ierr = MPI_Pcontrol(*static_cast(level)); } -void mpi_op_create_ (void * function, int* commute, int* op, int* ierr){ +void mpi_op_create_(void* function, int* commute, int* op, int* ierr) +{ MPI_Op tmp; - *ierr = MPI_Op_create(reinterpret_cast(function),*commute, &tmp); - if(*ierr == MPI_SUCCESS) { - tmp->set_fortran_op(); - *op = tmp->add_f(); - } + *ierr = MPI_Op_create(reinterpret_cast(function), *commute, &tmp); + if (*ierr == MPI_SUCCESS) { + tmp->set_fortran_op(); + *op = tmp->c2f(); + } } -void mpi_op_free_ (int* op, int* ierr){ +void mpi_op_free_(int* op, int* ierr) +{ MPI_Op tmp= simgrid::smpi::Op::f2c(*op); *ierr = MPI_Op_free(& tmp); - if(*ierr == MPI_SUCCESS) { - simgrid::smpi::F2C::free_f(*op); - } } -void mpi_op_commutative_ (int* op, int* commute, int* ierr){ +void mpi_op_commutative_(int* op, int* commute, int* ierr) +{ *ierr = MPI_Op_commutative(simgrid::smpi::Op::f2c(*op), commute); } -void mpi_group_free_ (int* group, int* ierr){ +void mpi_group_free_(int* group, int* ierr) +{ MPI_Group tmp = simgrid::smpi::Group::f2c(*group); - if(tmp != MPI_COMM_WORLD->group() && tmp != MPI_GROUP_EMPTY){ - simgrid::smpi::Group::unref(tmp); - simgrid::smpi::F2C::free_f(*group); - } - *ierr = MPI_SUCCESS; + *ierr = MPI_Group_free(&tmp); } -void mpi_group_size_ (int* group, int *size, int* ierr){ - - *ierr = MPI_Group_size(simgrid::smpi::Group::f2c(*group), size); +void mpi_group_size_(int* group, int* size, int* ierr) +{ + *ierr = MPI_Group_size(simgrid::smpi::Group::f2c(*group), size); } -void mpi_group_rank_ (int* group, int *rank, int* ierr){ - - *ierr = MPI_Group_rank(simgrid::smpi::Group::f2c(*group), rank); +void mpi_group_rank_(int* group, int* rank, int* ierr) +{ + *ierr = MPI_Group_rank(simgrid::smpi::Group::f2c(*group), rank); } void mpi_group_translate_ranks_ (int* group1, int* n, int *ranks1, int* group2, int *ranks2, int* ierr) { - *ierr = MPI_Group_translate_ranks(simgrid::smpi::Group::f2c(*group1), *n, ranks1, simgrid::smpi::Group::f2c(*group2), ranks2); } -void mpi_group_compare_ (int* group1, int* group2, int *result, int* ierr){ - - *ierr = MPI_Group_compare(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), result); +void mpi_group_compare_(int* group1, int* group2, int* result, int* ierr) +{ + *ierr = MPI_Group_compare(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), result); } -void mpi_group_union_ (int* group1, int* group2, int* newgroup, int* ierr){ - MPI_Group tmp; - *ierr = MPI_Group_union(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), &tmp); - if(*ierr == MPI_SUCCESS) { - *newgroup = tmp->add_f(); - } +void mpi_group_union_(int* group1, int* group2, int* newgroup, int* ierr) +{ + MPI_Group tmp; + *ierr = MPI_Group_union(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), &tmp); + if (*ierr == MPI_SUCCESS) { + *newgroup = tmp->c2f(); + } } -void mpi_group_intersection_ (int* group1, int* group2, int* newgroup, int* ierr){ - MPI_Group tmp; - *ierr = MPI_Group_intersection(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), &tmp); - if(*ierr == MPI_SUCCESS) { - *newgroup = tmp->add_f(); - } +void mpi_group_intersection_(int* group1, int* group2, int* newgroup, int* ierr) +{ + MPI_Group tmp; + *ierr = MPI_Group_intersection(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), &tmp); + if (*ierr == MPI_SUCCESS) { + *newgroup = tmp->c2f(); + } } -void mpi_group_difference_ (int* group1, int* group2, int* newgroup, int* ierr){ - MPI_Group tmp; - *ierr = MPI_Group_difference(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), &tmp); - if(*ierr == MPI_SUCCESS) { - *newgroup = tmp->add_f(); - } +void mpi_group_difference_(int* group1, int* group2, int* newgroup, int* ierr) +{ + MPI_Group tmp; + *ierr = MPI_Group_difference(simgrid::smpi::Group::f2c(*group1), simgrid::smpi::Group::f2c(*group2), &tmp); + if (*ierr == MPI_SUCCESS) { + *newgroup = tmp->c2f(); + } } -void mpi_group_excl_ (int* group, int* n, int *ranks, int* newgroup, int* ierr){ +void mpi_group_excl_(int* group, int* n, int* ranks, int* newgroup, int* ierr) +{ MPI_Group tmp; - *ierr = MPI_Group_excl(simgrid::smpi::Group::f2c(*group), *n, ranks, &tmp); - if(*ierr == MPI_SUCCESS) { - *newgroup = tmp->add_f(); - } + *ierr = MPI_Group_excl(simgrid::smpi::Group::f2c(*group), *n, ranks, &tmp); + if (*ierr == MPI_SUCCESS) { + *newgroup = tmp->c2f(); + } } void mpi_group_range_incl_ (int* group, int* n, int ranges[][3], int* newgroup, int* ierr) { MPI_Group tmp; - *ierr = MPI_Group_range_incl(simgrid::smpi::Group::f2c(*group), *n, ranges, &tmp); - if(*ierr == MPI_SUCCESS) { - *newgroup = tmp->add_f(); - } + *ierr = MPI_Group_range_incl(simgrid::smpi::Group::f2c(*group), *n, ranges, &tmp); + if (*ierr == MPI_SUCCESS) { + *newgroup = tmp->c2f(); + } } void mpi_group_range_excl_ (int* group, int* n, int ranges[][3], int* newgroup, int* ierr) @@ -591,16 +642,13 @@ void mpi_group_range_excl_ (int* group, int* n, int ranges[][3], int* newgroup, MPI_Group tmp; *ierr = MPI_Group_range_excl(simgrid::smpi::Group::f2c(*group), *n, ranges, &tmp); if(*ierr == MPI_SUCCESS) { - *newgroup = tmp->add_f(); + *newgroup = tmp->c2f(); } } void mpi_request_free_ (int* request, int* ierr){ MPI_Request tmp=simgrid::smpi::Request::f2c(*request); *ierr = MPI_Request_free(&tmp); - if(*ierr == MPI_SUCCESS) { - simgrid::smpi::Request::free_f(*request); - } } void mpi_pack_size_ (int* incount, int* datatype, int* comm, int* size, int* ierr) { @@ -615,7 +663,7 @@ void mpi_cart_create_ (int* comm_old, int* ndims, int* dims, int* periods, int* MPI_Comm tmp; *ierr = MPI_Cart_create(simgrid::smpi::Comm::f2c(*comm_old), *ndims, dims, periods, *reorder, &tmp); if(*ierr == MPI_SUCCESS) { - *comm_cart = tmp->add_f(); + *comm_cart = tmp->c2f(); } } @@ -639,7 +687,7 @@ void mpi_cart_sub_ (int* comm, int* remain_dims, int* comm_new, int* ierr) { MPI_Comm tmp; *ierr = MPI_Cart_sub(simgrid::smpi::Comm::f2c(*comm), remain_dims, &tmp); if(*ierr == MPI_SUCCESS) { - *comm_new = tmp->add_f(); + *comm_new = tmp->c2f(); } } @@ -651,7 +699,7 @@ void mpi_graph_create_ (int* comm_old, int* nnodes, int* index, int* edges, int* MPI_Comm tmp; *ierr = MPI_Graph_create(simgrid::smpi::Comm::f2c(*comm_old), *nnodes, index, edges, *reorder, &tmp); if(*ierr == MPI_SUCCESS) { - *comm_graph = tmp->add_f(); + *comm_graph = tmp->c2f(); } } @@ -732,7 +780,7 @@ void mpi_intercomm_create_ (int* local_comm, int *local_leader, int* peer_comm, *ierr = MPI_Intercomm_create(simgrid::smpi::Comm::f2c(*local_comm), *local_leader, simgrid::smpi::Comm::f2c(*peer_comm), *remote_leader, *tag, &tmp); if(*ierr == MPI_SUCCESS) { - *comm_out = tmp->add_f(); + *comm_out = tmp->c2f(); } } @@ -740,7 +788,7 @@ void mpi_intercomm_merge_ (int* comm, int* high, int* comm_out, int* ierr) { MPI_Comm tmp; *ierr = MPI_Intercomm_merge(simgrid::smpi::Comm::f2c(*comm), *high, &tmp); if(*ierr == MPI_SUCCESS) { - *comm_out = tmp->add_f(); + *comm_out = tmp->c2f(); } } @@ -749,15 +797,15 @@ void mpi_attr_delete_ (int* comm, int* keyval, int* ierr) { } void mpi_attr_put_ (int* comm, int* keyval, int* attr_value, int* ierr) { - int* val = (int*)xbt_malloc(sizeof(int)); - *val=*attr_value; - *ierr = MPI_Attr_put(simgrid::smpi::Comm::f2c(*comm), *keyval, val); + auto* val = xbt_new(int, 1); + *val = *attr_value; + *ierr = MPI_Attr_put(simgrid::smpi::Comm::f2c(*comm), *keyval, val); } void mpi_keyval_create_ (void* copy_fn, void* delete_fn, int* keyval, void* extra_state, int* ierr) { smpi_copy_fn _copy_fn={nullptr,nullptr,nullptr,(*(int*)copy_fn) == 0 ? nullptr : reinterpret_cast(copy_fn),nullptr,nullptr}; smpi_delete_fn _delete_fn={nullptr,nullptr,nullptr,(*(int*)delete_fn) == 0 ? nullptr : reinterpret_cast(delete_fn),nullptr,nullptr}; - *ierr = simgrid::smpi::Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state); + *ierr = simgrid::smpi::Keyval::keyval_create(_copy_fn, _delete_fn, keyval, extra_state, true); } void mpi_keyval_free_ (int* keyval, int* ierr) { @@ -792,7 +840,7 @@ void mpi_info_dup_ (int* info, int* newinfo, int* ierr){ MPI_Info tmp; *ierr = MPI_Info_dup(simgrid::smpi::Info::f2c(*info), &tmp); if(*ierr==MPI_SUCCESS){ - *newinfo= tmp->add_f(); + *newinfo= tmp->c2f(); } } @@ -803,11 +851,8 @@ void mpi_info_get_valuelen_ ( int* info, char *key, int *valuelen, int *flag, in keylen--; key++; } - char* tkey = xbt_new(char, keylen+1); - strncpy(tkey, key, keylen); - tkey[keylen]='\0'; - *ierr = MPI_Info_get_valuelen( simgrid::smpi::Info::f2c(*info), tkey, valuelen, flag); - xbt_free(tkey); + std::string tkey(key, keylen); + *ierr = MPI_Info_get_valuelen(simgrid::smpi::Info::f2c(*info), tkey.c_str(), valuelen, flag); } void mpi_info_delete_ (int* info, char *key, int* ierr, unsigned int keylen){ @@ -817,11 +862,8 @@ void mpi_info_delete_ (int* info, char *key, int* ierr, unsigned int keylen){ keylen--; key++; } - char* tkey = xbt_new(char, keylen+1); - strncpy(tkey, key, keylen); - tkey[keylen]='\0'; - *ierr = MPI_Info_delete(simgrid::smpi::Info::f2c(*info), tkey); - xbt_free(tkey); + std::string tkey(key, keylen); + *ierr = MPI_Info_delete(simgrid::smpi::Info::f2c(*info), tkey.c_str()); } void mpi_info_get_nkeys_ ( int* info, int *nkeys, int* ierr){ @@ -830,8 +872,7 @@ void mpi_info_get_nkeys_ ( int* info, int *nkeys, int* ierr){ void mpi_info_get_nthkey_ ( int* info, int* n, char *key, int* ierr, unsigned int keylen){ *ierr = MPI_Info_get_nthkey( simgrid::smpi::Info::f2c(*info), *n, key); - unsigned int i = 0; - for (i=strlen(key); i(strlen(key)); i < keylen; i++) key[i]=' '; } @@ -852,7 +893,7 @@ void mpi_grequest_start_ ( void *query_fn, void *free_fn, void *cancel_fn, void *ierr = MPI_Grequest_start( reinterpret_cast(query_fn), reinterpret_cast(free_fn), reinterpret_cast(cancel_fn), extra_state, &tmp); if(*ierr == MPI_SUCCESS) { - *request = tmp->add_f(); + *request = tmp->c2f(); } } @@ -888,28 +929,29 @@ void mpi_close_port_ ( char *port_name, int* ierr){ *ierr = MPI_Close_port( port_name); } -void mpi_file_close_ ( int* file, int* ierr){ - *ierr= MPI_File_close(reinterpret_cast(*file)); +void mpi_alloc_mem_(int* size, int* info, void *baseptr, int* ierr){ + *ierr = MPI_Alloc_mem(*size, simgrid::smpi::Info::f2c(*info), baseptr); } -void mpi_file_delete_ ( char* filename, int* info, int* ierr){ - *ierr= MPI_File_delete(filename, simgrid::smpi::Info::f2c(*info)); +void mpi_free_mem_(void *baseptr, int* ierr){ + *ierr = MPI_Free_mem(baseptr); } -void mpi_file_open_ ( int* comm, char* filename, int* amode, int* info, int* fh, int* ierr){ - *ierr= MPI_File_open(simgrid::smpi::Comm::f2c(*comm), filename, *amode, simgrid::smpi::Info::f2c(*info), reinterpret_cast(*fh)); + +void smpi_execute_flops_(double* flops){ + smpi_execute_flops(*flops); } -void mpi_file_set_view_ ( int* fh, long long int* offset, int* etype, int* filetype, char* datarep, int* info, int* ierr){ - *ierr= MPI_File_set_view(reinterpret_cast(*fh) , reinterpret_cast(*offset), simgrid::smpi::Datatype::f2c(*etype), simgrid::smpi::Datatype::f2c(*filetype), datarep, simgrid::smpi::Info::f2c(*info)); +void smpi_execute_flops_benched_(double* flops){ + smpi_execute_flops_benched(*flops); } -void mpi_file_read_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr){ - *ierr= MPI_File_read(reinterpret_cast(*fh), buf, *count, simgrid::smpi::Datatype::f2c(*datatype), status); +void smpi_execute_(double* duration){ + smpi_execute(*duration); } -void mpi_file_write_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr){ - *ierr= MPI_File_write(reinterpret_cast(*fh), buf, *count, simgrid::smpi::Datatype::f2c(*datatype), status); +void smpi_execute_benched_(double* duration){ + smpi_execute_benched(*duration); } } // extern "C"