-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2023. 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. */
#include "smpi_errhandler.hpp"
#include "smpi_info.hpp"
+#include <string>
+
extern "C" { // This should really use the C linkage to be usable from Fortran
void mpi_comm_rank_(int* comm, int* rank, int* ierr) {
*ierr = MPI_Comm_dup(simgrid::smpi::Comm::f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = tmp->add_f();
+ *newcomm = tmp->c2f();
}
}
MPI_Comm tmp;
*ierr = MPI_Comm_create(simgrid::smpi::Comm::f2c(*comm),simgrid::smpi::Group::f2c(*group), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = tmp->add_f();
+ *newcomm = tmp->c2f();
}
}
void mpi_comm_free_(int* comm, int* ierr) {
- MPI_Comm tmp = simgrid::smpi::Comm::f2c(*comm);
- if(tmp != MPI_COMM_WORLD && tmp != MPI_COMM_NULL) {
+ if (MPI_Comm tmp = simgrid::smpi::Comm::f2c(*comm); tmp != MPI_COMM_WORLD && tmp != MPI_COMM_NULL) {
simgrid::smpi::Comm::destroy(tmp);
simgrid::smpi::Comm::free_f(*comm);
}
*ierr = MPI_Comm_split(simgrid::smpi::Comm::f2c(*comm), *color, *key, &tmp);
if(*ierr == MPI_SUCCESS) {
- *comm_out = tmp->add_f();
+ *comm_out = tmp->c2f();
}
}
}
void mpi_comm_set_attr_ (int* comm, int* comm_keyval, int *attribute_val, int* ierr){
- auto* val = static_cast<int*>(xbt_malloc(sizeof(int)));
+ auto* val = xbt_new(int, 1);
*val = *attribute_val;
*ierr = MPI_Comm_set_attr(simgrid::smpi::Comm::f2c(*comm), *comm_keyval, val);
}
void mpi_comm_create_keyval_ (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<MPI_Comm_copy_attr_function_fort*>(copy_fn),nullptr,nullptr};
smpi_delete_fn _delete_fn={nullptr,nullptr,nullptr,(*(int*)delete_fn) == 0 ? nullptr : reinterpret_cast<MPI_Comm_delete_attr_function_fort*>(delete_fn),nullptr,nullptr};
- *ierr = simgrid::smpi::Keyval::keyval_create<simgrid::smpi::Comm>(_copy_fn, _delete_fn, keyval, extra_state);
+ *ierr = simgrid::smpi::Keyval::keyval_create<simgrid::smpi::Comm>(_copy_fn, _delete_fn, keyval, extra_state, true);
}
void mpi_comm_free_keyval_ (int* keyval, int* ierr) {
int count;
for(count=MPI_MAX_OBJECT_NAME-1; count>=0 && name[count]==' '; count--);
count+=1;
- char* tname = xbt_new(char, count+1);
- strncpy(tname, name, count);
- tname[count]='\0';
- *ierr = MPI_Comm_set_name (simgrid::smpi::Comm::f2c(*comm), tname);
- xbt_free(tname);
+ std::string tname(name, count);
+ *ierr = MPI_Comm_set_name(simgrid::smpi::Comm::f2c(*comm), tname.c_str());
}
void mpi_comm_dup_with_info_ (int* comm, int* info, int* newcomm, int* ierr){
MPI_Comm tmp;
*ierr = MPI_Comm_dup_with_info(simgrid::smpi::Comm::f2c(*comm), simgrid::smpi::Info::f2c(*info),&tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = tmp->add_f();
+ *newcomm = tmp->c2f();
}
}
MPI_Comm tmp;
*ierr = MPI_Comm_split_type(simgrid::smpi::Comm::f2c(*comm), *split_type, *key, simgrid::smpi::Info::f2c(*info), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = tmp->add_f();
+ *newcomm = tmp->c2f();
}
}
*ierr = MPI_Comm_call_errhandler(simgrid::smpi::Comm::f2c(*comm), *errorcode);
}
-void mpi_comm_connect_ ( char *port_name, int* info, int* root, int* comm, int*newcomm, int* ierr){
+void mpi_comm_connect_(char* port_name, int* info, int* root, int* comm, int* newcomm, int* ierr)
+{
MPI_Comm tmp;
- *ierr = MPI_Comm_connect( port_name, simgrid::smpi::Info::f2c(*info), *root, simgrid::smpi::Comm::f2c(*comm), &tmp);
+ *ierr = MPI_Comm_connect(port_name, simgrid::smpi::Info::f2c(*info), *root, simgrid::smpi::Comm::f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = tmp->add_f();
+ *newcomm = tmp->c2f();
}
}
MPI_Comm tmp;
*ierr = MPI_Comm_join( *fd, &tmp);
if(*ierr == MPI_SUCCESS) {
- *intercomm = tmp->add_f();
+ *intercomm = tmp->c2f();
}
}
MPI_Comm tmp;
*ierr = MPI_Comm_accept( port_name, simgrid::smpi::Info::f2c(*info), *root, simgrid::smpi::Comm::f2c(*comm), &tmp);
if(*ierr == MPI_SUCCESS) {
- *newcomm = tmp->add_f();
+ *newcomm = tmp->c2f();
}
}
*ierr = MPI_Comm_spawn( command, &argv, *maxprocs, simgrid::smpi::Info::f2c(*info), *root, simgrid::smpi::Comm::f2c(*comm), &tmp,
array_of_errcodes);
if(*ierr == MPI_SUCCESS) {
- *intercomm = tmp->add_f();
+ *intercomm = tmp->c2f();
}
}
*ierr = MPI_Comm_spawn_multiple(* count, &array_of_commands, &array_of_argv, array_of_maxprocs,
reinterpret_cast<MPI_Info*>(array_of_info), *root, simgrid::smpi::Comm::f2c(*comm), &tmp, array_of_errcodes);
if(*ierr == MPI_SUCCESS) {
- *intercomm = tmp->add_f();
+ *intercomm = tmp->c2f();
}
}