X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad12e936954df10a0395da3b161e820e07e97f52..e8f8350f07c1b13dd8628f56d5a5050da18264d3:/src/smpi/smpi_mpi.c

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 4a5cd8d51d..c709e0aaec 100644
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -5,1473 +5,658 @@
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "private.h"
-#include "smpi_coll_private.h"
-#include "smpi_mpi_dt_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi,
                                 "Logging specific to SMPI (mpi)");
 
 /* MPI User level calls */
 
-int MPI_Init(int* argc, char*** argv) {
-  smpi_process_init(argc, argv);
-  smpi_bench_begin(-1, NULL);
-#ifdef HAVE_TRACING
-  TRACE_smpi_init(smpi_process_index());
-#endif
-  return MPI_SUCCESS;
-}
-
-int MPI_Finalize(void) {
-#ifdef HAVE_TRACING
-  TRACE_smpi_finalize(smpi_process_index());
-#endif
-  smpi_bench_end(-1, NULL);
-  smpi_process_destroy();
-  return MPI_SUCCESS;
-}
-
-int MPI_Init_thread(int* argc, char*** argv, int required, int* provided) {
-  if(provided != NULL) {
-    *provided = MPI_THREAD_MULTIPLE;
-  }
-  return MPI_Init(argc, argv);
-}
-
-int MPI_Query_thread(int* provided) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(provided == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *provided = MPI_THREAD_MULTIPLE;
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Is_thread_main(int* flag) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(flag == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *flag = smpi_process_index() == 0;
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Abort(MPI_Comm comm, int errorcode) {
-  smpi_bench_end(-1, NULL);
-  smpi_process_destroy();
-  // FIXME: should kill all processes in comm instead
-  SIMIX_process_kill(SIMIX_process_self());
-  return MPI_SUCCESS;
-}
-
-double MPI_Wtime(void) {
-  double time;
-
-  smpi_bench_end(-1, NULL);
-  time = SIMIX_get_clock();
-  smpi_bench_begin(-1, NULL);
-  return time;
-}
-
-int MPI_Address(void *location, MPI_Aint *address) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(!address) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *address = (MPI_Aint)location;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Type_free(MPI_Datatype* datatype) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(!datatype) {
-    retval = MPI_ERR_ARG;
-  } else {
-    // FIXME: always fail for now
-    retval = MPI_ERR_TYPE;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Type_size(MPI_Datatype datatype, size_t* size) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(size == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *size = smpi_datatype_size(datatype);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint* lb, MPI_Aint* extent) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(lb == NULL || extent == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    retval = smpi_datatype_extent(datatype, lb, extent);
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint* extent) {
-  int retval;
-  MPI_Aint dummy;
-
-  smpi_bench_end(-1, NULL);
-  if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(extent == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    retval = smpi_datatype_extent(datatype, &dummy, extent);
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint* disp) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(disp == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *disp = smpi_datatype_lb(datatype);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint* disp) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(disp == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *disp = smpi_datatype_ub(datatype);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Op_create(MPI_User_function* function, int commute, MPI_Op* op) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(function == NULL || op == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *op = smpi_op_new(function, commute);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Op_free(MPI_Op* op) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(op == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if(*op == MPI_OP_NULL) {
-    retval = MPI_ERR_OP;
-  } else {
-    smpi_op_destroy(*op);
-    *op = MPI_OP_NULL;
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_free(MPI_Group *group) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(group == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_group_destroy(*group);
-    *group = MPI_GROUP_NULL;
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_size(MPI_Group group, int* size) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(size == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *size = smpi_group_size(group);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_rank(MPI_Group group, int* rank) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(rank == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *rank = smpi_group_rank(group, smpi_process_index());
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_translate_ranks (MPI_Group group1, int n, int* ranks1, MPI_Group group2, int* ranks2) {
-  int retval, i, index;
-
-  smpi_bench_end(-1, NULL);
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else {
-    for(i = 0; i < n; i++) {
-      index = smpi_group_index(group1, ranks1[i]);
-      ranks2[i] = smpi_group_rank(group2, index);
-    }
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int* result) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(result == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *result = smpi_group_compare(group1, group2);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) {
-  int retval, i, proc1, proc2, size, size2;
-
-  smpi_bench_end(-1, NULL);
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    size = smpi_group_size(group1);
-    size2 = smpi_group_size(group2);
-    for(i = 0; i < size2; i++) {
-      proc2 = smpi_group_index(group2, i);
-      proc1 = smpi_group_rank(group1, proc2);
-      if(proc1 == MPI_UNDEFINED) {
-        size++;
-      }
-    }
-    if(size == 0) {
-      *newgroup = MPI_GROUP_EMPTY;
-    } else {
-      *newgroup = smpi_group_new(size);
-      size2 = smpi_group_size(group1);
-      for(i = 0; i < size2; i++) {
-        proc1 = smpi_group_index(group1, i);
-        smpi_group_set_mapping(*newgroup, proc1, i);
-      }
-      for(i = size2; i < size; i++) {
-        proc2 = smpi_group_index(group2, i - size2);
-        smpi_group_set_mapping(*newgroup, proc2, i);
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) {
-   int retval, i, proc1, proc2, size, size2;
-
-  smpi_bench_end(-1, NULL);
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    size = smpi_group_size(group1);
-    size2 = smpi_group_size(group2);
-    for(i = 0; i < size2; i++) {
-      proc2 = smpi_group_index(group2, i);
-      proc1 = smpi_group_rank(group1, proc2);
-      if(proc1 == MPI_UNDEFINED) {
-        size--;
-      }
-    }
-    if(size == 0) {
-      *newgroup = MPI_GROUP_EMPTY;
-    } else {
-      *newgroup = smpi_group_new(size);
-      size2 = smpi_group_size(group1);
-      for(i = 0; i < size2; i++) {
-        proc1 = smpi_group_index(group1, i);
-        proc2 = smpi_group_rank(group2, proc1);
-        if(proc2 != MPI_UNDEFINED) {
-          smpi_group_set_mapping(*newgroup, proc1, i);
-        }
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) {
-  int retval, i, proc1, proc2, size, size2;
-
-  smpi_bench_end(-1, NULL);
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    size = size2 = smpi_group_size(group1);
-    for(i = 0; i < size2; i++) {
-      proc1 = smpi_group_index(group1, i);
-      proc2 = smpi_group_rank(group2, proc1);
-      if(proc2 != MPI_UNDEFINED) {
-        size--;
-      }
-    }
-    if(size == 0) {
-      *newgroup = MPI_GROUP_EMPTY;
-    } else {
-      *newgroup = smpi_group_new(size);
-      for(i = 0; i < size2; i++) {
-        proc1 = smpi_group_index(group1, i);
-        proc2 = smpi_group_rank(group2, proc1);
-        if(proc2 == MPI_UNDEFINED) {
-          smpi_group_set_mapping(*newgroup, proc1, i);
-        }
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) {
-  int retval, i, index;
-
-  smpi_bench_end(-1, NULL);
-  if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    if(n == 0) {
-      *newgroup = MPI_GROUP_EMPTY;
-    } else if(n == smpi_group_size(group)) {
-      *newgroup = group;
-    } else {
-      *newgroup = smpi_group_new(n);
-      for(i = 0; i < n; i++) {
-        index = smpi_group_index(group, ranks[i]);
-        smpi_group_set_mapping(*newgroup, index, i);
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_excl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) {
-  int retval, i, size, rank, index;
-
-  smpi_bench_end(-1, NULL);
-  if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    if(n == 0) {
-      *newgroup = group;
-    } else if(n == smpi_group_size(group)) {
-      *newgroup = MPI_GROUP_EMPTY;
-    } else {
-      size = smpi_group_size(group) - n;
-      *newgroup = smpi_group_new(size);
-      rank = 0;
-      while(rank < size) {
-        for(i = 0; i < n; i++) {
-          if(ranks[i] == rank) {
-            break;
-          }
-        }
-        if(i >= n) {
-          index = smpi_group_index(group, rank);
-          smpi_group_set_mapping(*newgroup, index, rank);
-          rank++;
-        }
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup) {
-  int retval, i, j, rank, size, index;
-
-  smpi_bench_end(-1, NULL);
-  if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    if(n == 0) {
-      *newgroup = MPI_GROUP_EMPTY;
-    } else {
-      size = 0;
-      for(i = 0; i < n; i++) {
-        for(rank = ranges[i][0]; /* First */
-            rank >= 0 && rank <= ranges[i][1]; /* Last */
-            rank += ranges[i][2] /* Stride */) {
-          size++;
-        }
-      }
-      if(size == smpi_group_size(group)) {
-        *newgroup = group;
-      } else {
-        *newgroup = smpi_group_new(size);
-        j = 0;
-        for(i = 0; i < n; i++) {
-          for(rank = ranges[i][0]; /* First */
-              rank >= 0 && rank <= ranges[i][1]; /* Last */
-              rank += ranges[i][2] /* Stride */) {
-            index = smpi_group_index(group, rank);
-            smpi_group_set_mapping(*newgroup, index, j);
-            j++;
-          }
-        }
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup) {
-  int retval, i, newrank, rank, size, index, add;
-
-  smpi_bench_end(-1, NULL);
-  if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    if(n == 0) {
-      *newgroup = group;
-    } else {
-      size = smpi_group_size(group);
-      for(i = 0; i < n; i++) {
-        for(rank = ranges[i][0]; /* First */
-            rank >= 0 && rank <= ranges[i][1]; /* Last */
-            rank += ranges[i][2] /* Stride */) {
-          size--;
-        }
-      }
-      if(size == 0) {
-        *newgroup = MPI_GROUP_EMPTY;
-      } else {
-        *newgroup = smpi_group_new(size);
-        newrank = 0;
-        while(newrank < size) {
-          for(i = 0; i < n; i++) {
-            add = 1;
-            for(rank = ranges[i][0]; /* First */
-                rank >= 0 && rank <= ranges[i][1]; /* Last */
-                rank += ranges[i][2] /* Stride */) {
-              if(rank == newrank) {
-                add = 0;
-                break;
-              }
-            }
-            if(add == 1) {
-              index = smpi_group_index(group, newrank);
-              smpi_group_set_mapping(*newgroup, index, newrank);
-            }
-          }
-        }
-      }
-    }
-    smpi_group_use(*newgroup);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_rank(MPI_Comm comm, int* rank) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    *rank = smpi_comm_rank(comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_size(MPI_Comm comm, int* size) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(size == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *size = smpi_comm_size(comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_group(MPI_Comm comm, MPI_Group* group) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(group == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *group = smpi_comm_group(comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int* result) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(result == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    if(comm1 == comm2) { /* Same communicators means same groups */
-      *result = MPI_IDENT;
-    } else {
-      *result = smpi_group_compare(smpi_comm_group(comm1), smpi_comm_group(comm2));
-      if(*result == MPI_IDENT) {
-        *result = MPI_CONGRUENT;
-      }
-    }
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_dup(MPI_Comm comm, MPI_Comm* newcomm) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(newcomm == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *newcomm = smpi_comm_new(smpi_comm_group(comm));
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm* newcomm) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(group == MPI_GROUP_NULL) {
-    retval = MPI_ERR_GROUP;
-  } else if(newcomm == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *newcomm = smpi_comm_new(group);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Comm_free(MPI_Comm* comm) {
-  int retval;
-
-  smpi_bench_end(-1, NULL);
-  if(comm == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if(*comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    smpi_comm_destroy(*comm);
-    *comm = MPI_COMM_NULL;
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Send_init(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-  smpi_bench_end(rank, "Send_init");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    *request = smpi_mpi_send_init(buf, count, datatype, dst, tag, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Send_init");
-  return retval;
-}
-
-int MPI_Recv_init(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-  smpi_bench_end(rank, "Recv_init");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    *request = smpi_mpi_recv_init(buf, count, datatype, src, tag, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Recv_init");
-  return retval;
-}
-
-int MPI_Start(MPI_Request* request) {
-  int retval;
-  MPI_Comm comm = (*request)->comm;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-  smpi_bench_end(rank, "Start");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_start(*request);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Start");
-  return retval;
-}
-
-int MPI_Startall(int count, MPI_Request* requests) {
-  int retval;
-  MPI_Comm comm = count > 0 && requests ? requests[0]->comm : MPI_COMM_NULL;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-  smpi_bench_end(rank, "Startall");
-  if(requests == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_startall(count, requests);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Startall");
-  return retval;
-}
-
-int MPI_Request_free(MPI_Request* request) {
-  int retval;
-  MPI_Comm comm = (*request)->comm;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-  smpi_bench_end(rank, "Request_free");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_request_free(request);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Request_free");
-  return retval;
-}
-
-int MPI_Irecv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
-  TRACE_smpi_ptp_in (rank, src_traced, rank, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Irecv");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    *request = smpi_mpi_irecv(buf, count, datatype, src, tag, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Irecv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_ptp_out (rank, src_traced, rank, __FUNCTION__);
-  (*request)->recv = 1;
-#endif
-  return retval;
-}
-
-int MPI_Isend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
-  TRACE_smpi_ptp_in (rank, rank, dst_traced, __FUNCTION__);
-  TRACE_smpi_send (rank, rank, dst_traced);
-#endif
-  smpi_bench_end(rank, "Isend");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    *request = smpi_mpi_isend(buf, count, datatype, dst, tag, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Isend");
-#ifdef HAVE_TRACING
-  TRACE_smpi_ptp_out (rank, rank, dst_traced, __FUNCTION__);
-  (*request)->send = 1;
-#endif
-  return retval;
-}
-
-int MPI_Recv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
-  TRACE_smpi_ptp_in (rank, src_traced, rank, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Recv");
-  if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    smpi_mpi_recv(buf, count, datatype, src, tag, comm, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Recv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_ptp_out (rank, src_traced, rank, __FUNCTION__);
-  TRACE_smpi_recv (rank, src_traced, rank);
-#endif
-  return retval;
-}
-
-int MPI_Send(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
-  TRACE_smpi_ptp_in (rank, rank, dst_traced, __FUNCTION__);
-  TRACE_smpi_send (rank, rank, dst_traced);
-#endif
-  smpi_bench_end(rank, "Send");
-  if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    smpi_mpi_send(buf, count, datatype, dst, tag, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Send");
-#ifdef HAVE_TRACING
-  TRACE_smpi_ptp_out (rank, rank, dst_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf, int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status* status) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int dst_traced = smpi_group_rank(smpi_comm_group(comm), dst);
-  int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
-  TRACE_smpi_ptp_in (rank, src_traced, dst_traced, __FUNCTION__);
-  TRACE_smpi_send (rank, rank, dst_traced);
-  TRACE_smpi_send (rank, src_traced, rank);
-#endif
-  smpi_bench_end(rank, "Sendrecv");
-  if (comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if (sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else {
-    smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Sendrecv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_ptp_out (rank, src_traced, dst_traced, __FUNCTION__);
-  TRACE_smpi_recv (rank, rank, dst_traced);
-  TRACE_smpi_recv (rank, src_traced, rank);
-#endif
-  return retval;
-}
-
-int MPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, MPI_Comm comm, MPI_Status* status) {
-  //TODO: suboptimal implementation
-  void* recvbuf;
-  int retval, size;
-
-  size = smpi_datatype_size(datatype) * count;
-  recvbuf = xbt_new(char, size);
-  retval = MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count, datatype, src, recvtag, comm, status);
-  memcpy(buf, recvbuf, size * sizeof(char));
-  xbt_free(recvbuf);
-  return retval;
-}
-
-int MPI_Test(MPI_Request* request, int* flag, MPI_Status* status) {
-  int retval;
-  int rank = request && (*request)->comm != MPI_COMM_NULL
-             ? smpi_comm_rank((*request)->comm)
-             : -1;
-
-  smpi_bench_end(rank, "Test");
-  if(request == NULL || flag == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if(*request == MPI_REQUEST_NULL) {
-    retval = MPI_ERR_REQUEST;
-  } else {
-    *flag = smpi_mpi_test(request, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Test");
-  return retval;
-}
-
-int MPI_Testany(int count, MPI_Request requests[], int* index, int* flag, MPI_Status* status) {
-  int retval;
-
-  smpi_bench_end(-1, NULL); //FIXME
-  if(index == NULL || flag == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *flag = smpi_mpi_testany(count, requests, index, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Wait(MPI_Request* request, MPI_Status* status) {
-  int retval;
-  int rank = request && (*request)->comm != MPI_COMM_NULL
-             ? smpi_comm_rank((*request)->comm)
-             : -1;
-
-#ifdef HAVE_TRACING
-  MPI_Group group = smpi_comm_group((*request)->comm);
-  int src_traced = smpi_group_rank (group , (*request)->src);
-  int dst_traced = smpi_group_rank (group , (*request)->dst);
-  int is_wait_for_receive = (*request)->recv;
-  TRACE_smpi_ptp_in (rank, src_traced, dst_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Wait");
-  if(request == NULL) {
-    retval = MPI_ERR_ARG;
-  } else if(*request == MPI_REQUEST_NULL) {
-    retval = MPI_ERR_REQUEST;
-  } else {
-    smpi_mpi_wait(request, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Wait");
-#ifdef HAVE_TRACING
-  TRACE_smpi_ptp_out (rank, src_traced, dst_traced, __FUNCTION__);
-  if (is_wait_for_receive){
-    TRACE_smpi_recv (rank, src_traced, dst_traced);
-  }
-#endif
-  return retval;
-}
-
-int MPI_Waitany(int count, MPI_Request requests[], int* index, MPI_Status* status) {
-  int retval;
-
-#ifdef HAVE_TRACING
-  //save requests information for tracing
-  int i;
-  xbt_dynar_t srcs = xbt_dynar_new (sizeof(int), xbt_free);
-  xbt_dynar_t dsts = xbt_dynar_new (sizeof(int), xbt_free);
-  xbt_dynar_t recvs = xbt_dynar_new (sizeof(int), xbt_free);
-  for (i = 0; i < count; i++){
-    MPI_Request req = requests[i]; //already received requests are no longer valid
-    if (req){
-      int *asrc = xbt_new(int, 1);
-      int *adst = xbt_new(int, 1);
-      int *arecv = xbt_new(int, 1);
-      *asrc = req->src;
-      *adst = req->dst;
-      *arecv = req->recv;
-      xbt_dynar_insert_at (srcs, i, asrc);
-      xbt_dynar_insert_at (dsts, i, adst);
-      xbt_dynar_insert_at (recvs, i, arecv);
-    }else{
-      int *t = xbt_new(int, 1);
-      xbt_dynar_insert_at (srcs, i, t);
-      xbt_dynar_insert_at (dsts, i, t);
-      xbt_dynar_insert_at (recvs, i, t);
-    }
-  }
-
-  //search for a suitable request to give the rank of current mpi proc
-  MPI_Request req = NULL;
-  for (i = 0; i < count && req == NULL; i++) {
-    req = requests[i];
-  }
-  MPI_Comm comm = (req)->comm;
-  int rank_traced = smpi_comm_rank(comm);
-  TRACE_smpi_ptp_in (rank_traced, -1, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(-1, NULL); //FIXME
-  if(index == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *index = smpi_mpi_waitany(count, requests, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-#ifdef HAVE_TRACING
-  int src_traced, dst_traced, is_wait_for_receive;
-  xbt_dynar_get_cpy (srcs, *index, &src_traced);
-  xbt_dynar_get_cpy (dsts, *index, &dst_traced);
-  xbt_dynar_get_cpy (recvs, *index, &is_wait_for_receive);
-  if (is_wait_for_receive){
-    TRACE_smpi_recv (rank_traced, src_traced, dst_traced);
-  }
-  TRACE_smpi_ptp_out (rank_traced, src_traced, dst_traced, __FUNCTION__);
-  //clean-up of dynars
-  xbt_free (srcs);
-  xbt_free (dsts);
-  xbt_free (recvs);
-#endif
-  return retval;
-}
-
-int MPI_Waitall(int count, MPI_Request requests[],  MPI_Status status[]) {
-
-#ifdef HAVE_TRACING
-  //save information from requests
-  int i;
-  xbt_dynar_t srcs = xbt_dynar_new (sizeof(int), xbt_free);
-  xbt_dynar_t dsts = xbt_dynar_new (sizeof(int), xbt_free);
-  xbt_dynar_t recvs = xbt_dynar_new (sizeof(int), xbt_free);
-  for (i = 0; i < count; i++){
-    MPI_Request req = requests[i]; //all req should be valid in Waitall
-    int *asrc = xbt_new(int, 1);
-    int *adst = xbt_new(int, 1);
-    int *arecv = xbt_new(int, 1);
-    *asrc = req->src;
-    *adst = req->dst;
-    *arecv = req->recv;
-    xbt_dynar_insert_at (srcs, i, asrc);
-    xbt_dynar_insert_at (dsts, i, adst);
-    xbt_dynar_insert_at (recvs, i, arecv);
-  }
-
-//  find my rank inside one of MPI_Comm's of the requests
-  MPI_Request req = NULL;
-  for (i = 0; i < count && req == NULL; i++) {
-    req = requests[i];
-  }
-  MPI_Comm comm = (req)->comm;
-  int rank_traced = smpi_comm_rank(comm);
-  TRACE_smpi_ptp_in (rank_traced, -1, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(-1, NULL); //FIXME
-  smpi_mpi_waitall(count, requests, status);
-  smpi_bench_begin(-1, NULL);
-#ifdef HAVE_TRACING
-  for (i = 0; i < count; i++){
-    int src_traced, dst_traced, is_wait_for_receive;
-    xbt_dynar_get_cpy (srcs, i, &src_traced);
-    xbt_dynar_get_cpy (dsts, i, &dst_traced);
-    xbt_dynar_get_cpy (recvs, i, &is_wait_for_receive);
-    if (is_wait_for_receive){
-      TRACE_smpi_recv (rank_traced, src_traced, dst_traced);
-    }
-  }
-  TRACE_smpi_ptp_out (rank_traced, -1, -1, __FUNCTION__);
-  //clean-up of dynars
-  xbt_free (srcs);
-  xbt_free (dsts);
-  xbt_free (recvs);
-#endif
-  return MPI_SUCCESS;
-}
-
-int MPI_Waitsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) {
-  int retval;
-
-  smpi_bench_end(-1, NULL); //FIXME
-  if(outcount == NULL || indices == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *outcount = smpi_mpi_waitsome(incount, requests, indices, status);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(-1, NULL);
-  return retval;
-}
-
-int MPI_Bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
-  TRACE_smpi_collective_in (rank, root_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Bcast");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    smpi_mpi_bcast(buf, count, datatype, root, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Bcast");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, root_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Barrier(MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Barrier");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else {
-    smpi_mpi_barrier(comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Barrier");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Gather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
-  TRACE_smpi_collective_in (rank, root_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Gather");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else {
-    smpi_mpi_gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Gather");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, root_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Gatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, MPI_Datatype recvtype, int root, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
-  TRACE_smpi_collective_in (rank, root_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Gatherv");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(recvcounts == NULL || displs == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Gatherv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, root_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Allgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Allgather");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else {
-    smpi_mpi_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Allgather");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Allgatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, MPI_Datatype recvtype, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Allgatherv");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(recvcounts == NULL || displs == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Allgatherv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Scatter(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
-  TRACE_smpi_collective_in (rank, root_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Scatter");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else {
-    smpi_mpi_scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Scatter");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, root_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Scatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
-  TRACE_smpi_collective_in (rank, root_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Scatterv");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(sendcounts == NULL || displs == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Scatterv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, root_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Reduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
-  TRACE_smpi_collective_in (rank, root_traced, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Reduce");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    smpi_mpi_reduce(sendbuf, recvbuf, count, datatype, op, root, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Reduce");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, root_traced, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Allreduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Allreduce");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(op == MPI_OP_NULL) {
-    retval = MPI_ERR_OP;
-  } else {
-    smpi_mpi_allreduce(sendbuf, recvbuf, count, datatype, op, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Allreduce");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Scan(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Scan");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(op == MPI_OP_NULL) {
-    retval = MPI_ERR_OP;
-  } else {
-    smpi_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Scan");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int* recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) {
-  int retval, i, size, count;
-  int* displs;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Reduce_scatter");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(op == MPI_OP_NULL) {
-    retval = MPI_ERR_OP;
-  } else if(recvcounts == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    /* arbitrarily choose root as rank 0 */
-    /* TODO: faster direct implementation ? */
-    size = smpi_comm_size(comm);
-    count = 0;
-    displs = xbt_new(int, size);
-    for(i = 0; i < size; i++) {
-      count += recvcounts[i];
-      displs[i] = 0;
-    }
-    smpi_mpi_reduce(sendbuf, recvbuf, count, datatype, op, 0, comm);
-    smpi_mpi_scatterv(recvbuf, recvcounts, displs, datatype, recvbuf, recvcounts[rank], datatype, 0, comm);
-    xbt_free(displs);
-    retval = MPI_SUCCESS;
-  }
-  smpi_bench_begin(rank, "Reduce_scatter");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
-  int retval, size, sendsize;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Alltoall");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else {
-    size = smpi_comm_size(comm);
-    sendsize = smpi_datatype_size(sendtype) * sendcount;
-    if(sendsize < 200 && size > 12) {
-      retval = smpi_coll_tuned_alltoall_bruck(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
-    } else if(sendsize < 3000) {
-      retval = smpi_coll_tuned_alltoall_basic_linear(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
-    } else {
-      retval = smpi_coll_tuned_alltoall_pairwise(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
-    }
-  }
-  smpi_bench_begin(rank, "Alltoall");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-int MPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype sendtype, void* recvbuf, int *recvcounts, int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm) {
-  int retval;
-  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
-
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_in (rank, -1, __FUNCTION__);
-#endif
-  smpi_bench_end(rank, "Alltoallv");
-  if(comm == MPI_COMM_NULL) {
-    retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
-    retval = MPI_ERR_TYPE;
-  } else if(sendcounts == NULL || senddisps == NULL || recvcounts == NULL || recvdisps == NULL) {
-    retval = MPI_ERR_ARG;
-  } else {
-    retval = smpi_coll_basic_alltoallv(sendbuf, sendcounts, senddisps, sendtype, recvbuf, recvcounts, recvdisps, recvtype, comm);
-  }
-  smpi_bench_begin(rank, "Alltoallv");
-#ifdef HAVE_TRACING
-  TRACE_smpi_collective_out (rank, -1, __FUNCTION__);
-#endif
-  return retval;
-}
-
-
-int MPI_Get_processor_name( char *name, int *resultlen ) {
-  int retval = MPI_SUCCESS;
-  smpi_bench_end(-1, NULL);
-  strncpy( name , SIMIX_host_get_name(SIMIX_host_self()), MPI_MAX_PROCESSOR_NAME-1);
-  *resultlen= strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
-
-  smpi_bench_begin(-1, NULL);
-  return retval;
+int MPI_Init(int *argc, char ***argv)
+{
+  return PMPI_Init(argc, argv);
 }
 
+int MPI_Finalize(void)
+{
+  return PMPI_Finalize();
+}
+
+int MPI_Init_thread(int *argc, char ***argv, int required, int *provided)
+{
+  return PMPI_Init_thread(argc, argv, required, provided);
+}
+
+int MPI_Query_thread(int *provided)
+{
+  return PMPI_Query_thread(provided);
+}
+
+int MPI_Is_thread_main(int *flag)
+{
+  return PMPI_Is_thread_main(flag);
+}
+
+int MPI_Abort(MPI_Comm comm, int errorcode)
+{
+  return PMPI_Abort(comm, errorcode);
+}
+
+double MPI_Wtime(void)
+{
+  return PMPI_Wtime();
+}
+
+int MPI_Address(void *location, MPI_Aint * address)
+{
+  return PMPI_Address(location, address);
+}
+
+int MPI_Type_free(MPI_Datatype * datatype)
+{
+  return PMPI_Type_free(datatype);
+}
+
+int MPI_Type_size(MPI_Datatype datatype, int *size)
+{
+  return PMPI_Type_size(datatype, size);
+}
+
+int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb, MPI_Aint * extent)
+{
+  return PMPI_Type_get_extent(datatype, lb, extent);
+}
+
+int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent)
+{
+  return PMPI_Type_extent(datatype, extent);
+}
+
+int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint * disp)
+{
+  return PMPI_Type_lb(datatype, disp);
+}
+
+int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp)
+{
+  return PMPI_Type_ub(datatype, disp);
+}
+
+int MPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op)
+{
+  return PMPI_Op_create(function, commute, op);
+}
+
+int MPI_Op_free(MPI_Op * op)
+{
+  return PMPI_Op_free(op);
+}
+
+int MPI_Group_free(MPI_Group * group)
+{
+  return PMPI_Group_free(group);
+}
+
+int MPI_Group_size(MPI_Group group, int *size)
+{
+  return PMPI_Group_size(group, size);
+}
+
+int MPI_Group_rank(MPI_Group group, int *rank)
+{
+  return PMPI_Group_rank(group, rank);
+}
+
+int MPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
+                              MPI_Group group2, int *ranks2)
+{
+  return PMPI_Group_translate_ranks(group1, n, ranks1, group2, ranks2);
+}
+
+int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result)
+{
+  return PMPI_Group_compare(group1, group2, result);
+}
+
+int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup)
+{
+  return PMPI_Group_union(group1, group2, newgroup);
+}
+
+int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup)
+{
+  return PMPI_Group_intersection(group1, group2, newgroup);
+}
+
+int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group * newgroup)
+{
+  return PMPI_Group_difference(group1, group2, newgroup);
+}
+
+int MPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
+{
+  return PMPI_Group_incl(group, n, ranks, newgroup);
+}
+
+int MPI_Group_excl(MPI_Group group, int n, int *ranks, MPI_Group * newgroup)
+{
+  return PMPI_Group_excl(group, n, ranks, newgroup);
+}
+
+int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3],
+                         MPI_Group * newgroup)
+{
+  return PMPI_Group_range_incl(group, n, ranges, newgroup);
+}
+
+int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3],
+                         MPI_Group * newgroup)
+{
+  return PMPI_Group_range_excl(group, n, ranges, newgroup);
+}
+
+int MPI_Comm_rank(MPI_Comm comm, int *rank)
+{
+  return PMPI_Comm_rank(comm, rank);
+}
+
+int MPI_Comm_size(MPI_Comm comm, int *size)
+{
+  return PMPI_Comm_size(comm, size);
+}
+
+int MPI_Comm_get_name (MPI_Comm comm, char* name, int* len)
+{
+  return PMPI_Comm_get_name(comm, name, len);
+}
+
+int MPI_Comm_group(MPI_Comm comm, MPI_Group * group)
+{
+  return PMPI_Comm_group(comm, group);
+}
+
+int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result)
+{
+  return PMPI_Comm_compare(comm1, comm2, result);
+}
+
+int MPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm)
+{
+  return PMPI_Comm_dup(comm, newcomm);
+}
+
+int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm)
+{
+  return PMPI_Comm_create(comm, group, newcomm);
+}
+
+int MPI_Comm_free(MPI_Comm * comm)
+{
+  return PMPI_Comm_free(comm);
+}
+
+int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out)
+{
+  return PMPI_Comm_split(comm, color, key, comm_out);
+}
+
+int MPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst,
+                  int tag, MPI_Comm comm, MPI_Request * request)
+{
+  return PMPI_Send_init(buf, count, datatype, dst, tag, comm, request);
+}
+
+int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src,
+                  int tag, MPI_Comm comm, MPI_Request * request)
+{
+  return PMPI_Recv_init(buf, count, datatype, src, tag, comm, request);
+}
+
+int MPI_Start(MPI_Request * request)
+{
+  return PMPI_Start(request);
+}
+
+int MPI_Startall(int count, MPI_Request * requests)
+{
+  return PMPI_Startall(count, requests);
+}
+
+int MPI_Request_free(MPI_Request * request)
+{
+  return PMPI_Request_free(request);
+}
+
+int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src,
+              int tag, MPI_Comm comm, MPI_Request * request)
+{
+  return PMPI_Irecv(buf, count, datatype, src, tag, comm, request);
+}
+
+int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst,
+              int tag, MPI_Comm comm, MPI_Request * request)
+{
+  return PMPI_Isend(buf, count, datatype, dst, tag, comm, request);
+}
+
+int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag,
+             MPI_Comm comm, MPI_Status * status)
+{
+  return PMPI_Recv(buf, count, datatype, src, tag, comm, status);
+}
+
+int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag,
+             MPI_Comm comm)
+{
+  return PMPI_Send(buf, count, datatype, dst, tag, comm);
+}
+
+int MPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                 int dst, int sendtag, void *recvbuf, int recvcount,
+                 MPI_Datatype recvtype, int src, int recvtag,
+                 MPI_Comm comm, MPI_Status * status)
+{
+  return PMPI_Sendrecv(sendbuf, sendcount, sendtype, dst, sendtag,
+                       recvbuf, recvcount, recvtype, src, recvtag,
+                       comm, status);
+}
+
+int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype,
+                         int dst, int sendtag, int src, int recvtag,
+                         MPI_Comm comm, MPI_Status * status)
+{
+  return PMPI_Sendrecv_replace(buf, count, datatype, dst, sendtag, src,
+                               recvtag, comm, status);
+}
+
+int MPI_Test(MPI_Request * request, int *flag, MPI_Status * status)
+{
+  return PMPI_Test(request, flag, status);
+}
+
+int MPI_Testany(int count, MPI_Request requests[], int *index, int *flag,
+                MPI_Status * status)
+{
+  return PMPI_Testany(count, requests, index, flag, status);
+}
+
+int MPI_Wait(MPI_Request * request, MPI_Status * status)
+{
+  return PMPI_Wait(request, status);
+}
+
+int MPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * status)
+{
+  return PMPI_Waitany(count, requests, index, status);
+}
+
+int MPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
+{
+  return PMPI_Waitall(count, requests, status);
+}
+
+int MPI_Waitsome(int incount, MPI_Request requests[], int *outcount,
+                 int *indices, MPI_Status status[])
+{
+  return PMPI_Waitsome(incount, requests, outcount, indices, status);
+}
+
+int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm)
+{
+  return PMPI_Bcast(buf, count, datatype, root, comm);
+}
+
+int MPI_Barrier(MPI_Comm comm)
+{
+  return PMPI_Barrier(comm);
+}
+
+int MPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+               void *recvbuf, int recvcount, MPI_Datatype recvtype,
+               int root, MPI_Comm comm)
+{
+  return PMPI_Gather(sendbuf, sendcount, sendtype,
+                     recvbuf, recvcount, recvtype,
+                     root, comm);
+}
+
+int MPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                void *recvbuf, int *recvcounts, int *displs,
+                MPI_Datatype recvtype, int root, MPI_Comm comm)
+{
+  return PMPI_Gatherv(sendbuf, sendcount, sendtype,
+                      recvbuf, recvcounts, displs, recvtype,
+                      root, comm);
+}
+
+int MPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                  void *recvbuf, int recvcount, MPI_Datatype recvtype,
+                  MPI_Comm comm)
+{
+  return PMPI_Allgather(sendbuf, sendcount, sendtype,
+                        recvbuf, recvcount, recvtype,
+                        comm);
+}
+
+int MPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                   void *recvbuf, int *recvcounts, int *displs,
+                   MPI_Datatype recvtype, MPI_Comm comm)
+{
+  return PMPI_Allgatherv(sendbuf, sendcount, sendtype,
+                         recvbuf, recvcounts, displs, recvtype,
+                         comm);
+}
+
+int MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                void *recvbuf, int recvcount, MPI_Datatype recvtype,
+                int root, MPI_Comm comm)
+{
+  return PMPI_Scatter(sendbuf, sendcount, sendtype,
+                      recvbuf, recvcount, recvtype,
+                      root, comm);
+}
+
+int MPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
+                 MPI_Datatype sendtype, void *recvbuf, int recvcount,
+                 MPI_Datatype recvtype, int root, MPI_Comm comm)
+{
+  return PMPI_Scatterv(sendbuf, sendcounts, displs, sendtype,
+                       recvbuf, recvcount, recvtype,
+                       root, comm);
+}
+
+int MPI_Reduce(void *sendbuf, void *recvbuf, int count,
+               MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm)
+{
+  return PMPI_Reduce(sendbuf, recvbuf, count, datatype, op, root, comm);
+}
+
+int MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
+                  MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
+{
+  return PMPI_Allreduce(sendbuf, recvbuf, count, datatype, op, comm);
+}
+
+int MPI_Scan(void *sendbuf, void *recvbuf, int count,
+             MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
+{
+  return PMPI_Scan(sendbuf, recvbuf, count, datatype, op, comm);
+}
+
+int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
+                       MPI_Datatype datatype, MPI_Op op, MPI_Comm comm)
+{
+  return PMPI_Reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm);
+}
+
+int MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                 void *recvbuf, int recvcount, MPI_Datatype recvtype,
+                 MPI_Comm comm)
+{
+  return PMPI_Alltoall(sendbuf, sendcount, sendtype,
+                       recvbuf, recvcount, recvtype,
+                       comm);
+}
+
+int MPI_Alltoallv(void *sendbuf, int *sendcounts, int *senddisps,
+                  MPI_Datatype sendtype, void *recvbuf, int *recvcounts,
+                  int *recvdisps, MPI_Datatype recvtype, MPI_Comm comm)
+{
+  return PMPI_Alltoallv(sendbuf, sendcounts, senddisps, sendtype,
+                        recvbuf, recvcounts, recvdisps, recvtype,
+                        comm);
+}
+
+
+int MPI_Get_processor_name(char *name, int *resultlen)
+{
+  return PMPI_Get_processor_name(name, resultlen);
+}
+
+int MPI_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count)
+{
+  return PMPI_Get_count(status, datatype, count);
+}
+
+int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int* size) {
+  return PMPI_Pack_size(incount, datatype, comm, size);
+}
+
+int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int* coords) {
+  return PMPI_Cart_coords(comm, rank, maxdims, coords);
+}
+
+int MPI_Cart_create(MPI_Comm comm_old, int ndims, int* dims, int* periods, int reorder, MPI_Comm* comm_cart) {
+  return PMPI_Cart_create(comm_old, ndims, dims, periods, reorder, comm_cart);
+}
+
+int MPI_Cart_get(MPI_Comm comm, int maxdims, int* dims, int* periods, int* coords) {
+  return PMPI_Cart_get(comm, maxdims, dims, periods, coords);
+}
+
+int MPI_Cart_map(MPI_Comm comm_old, int ndims, int* dims, int* periods, int* newrank) {
+  return PMPI_Cart_map(comm_old, ndims, dims, periods, newrank);
+}
+
+int MPI_Cart_rank(MPI_Comm comm, int* coords, int* rank) {
+  return PMPI_Cart_rank(comm, coords, rank);
+}
+
+int MPI_Cart_shift(MPI_Comm comm, int direction, int displ, int* source, int* dest) {
+  return PMPI_Cart_shift(comm, direction, displ, source, dest);
+}
+
+int MPI_Cart_sub(MPI_Comm comm, int* remain_dims, MPI_Comm* comm_new) {
+  return PMPI_Cart_sub(comm, remain_dims, comm_new);
+}
+
+int MPI_Cartdim_get(MPI_Comm comm, int* ndims) {
+  return PMPI_Cartdim_get(comm, ndims);
+}
+
+int MPI_Graph_create(MPI_Comm comm_old, int nnodes, int* index, int* edges, int reorder, MPI_Comm* comm_graph) {
+  return PMPI_Graph_create(comm_old, nnodes, index, edges, reorder, comm_graph);
+}
+
+int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, int* index, int* edges) {
+  return PMPI_Graph_get(comm, maxindex, maxedges, index, edges);
+}
+
+int MPI_Graph_map(MPI_Comm comm_old, int nnodes, int* index, int* edges, int* newrank) {
+  return PMPI_Graph_map(comm_old, nnodes, index, edges, newrank);
+}
+
+int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int* neighbors) {
+  return PMPI_Graph_neighbors(comm, rank, maxneighbors, neighbors);
+}
+
+int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int* nneighbors) {
+  return PMPI_Graph_neighbors_count(comm, rank, nneighbors);
+}
+
+int MPI_Graphdims_get(MPI_Comm comm, int* nnodes, int* nedges) {
+  return PMPI_Graphdims_get(comm, nnodes, nedges);
+}
+
+int MPI_Topo_test(MPI_Comm comm, int* top_type) {
+  return PMPI_Topo_test(comm, top_type);
+}
+
+int MPI_Error_class(int errorcode, int* errorclass) {
+  return PMPI_Error_class(errorcode, errorclass);
+}
+
+int MPI_Errhandler_create(MPI_Handler_function* function, MPI_Errhandler* errhandler) {
+  return PMPI_Errhandler_create(function, errhandler);
+}
+
+int MPI_Errhandler_free(MPI_Errhandler* errhandler) {
+  return PMPI_Errhandler_free(errhandler);
+}
+
+int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler* errhandler) {
+  return PMPI_Errhandler_get(comm, errhandler);
+}
+
+int MPI_Error_string(int errorcode, char* string, int* resultlen) {
+  return PMPI_Error_string(errorcode, string, resultlen);
+}
+
+int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) {
+  return PMPI_Errhandler_set(comm, errhandler);
+}
+
+int MPI_Type_contiguous(int count, MPI_Datatype old_type, MPI_Datatype* newtype) {
+  return PMPI_Type_contiguous(count, old_type, newtype);
+}
+
+int MPI_Cancel(MPI_Request* request) {
+  return PMPI_Cancel(request);
+}
+
+int MPI_Buffer_attach(void* buffer, int size) {
+  return PMPI_Buffer_attach(buffer, size);
+}
+
+int MPI_Buffer_detach(void* buffer, int* size) {
+  return PMPI_Buffer_detach(buffer, size);
+}
+
+int MPI_Testsome(int incount, MPI_Request* requests, int* outcount, int* indices, MPI_Status* statuses) {
+  return PMPI_Testsome(incount, requests, outcount, indices, statuses);
+}
+
+int MPI_Comm_test_inter(MPI_Comm comm, int* flag) {
+  return PMPI_Comm_test_inter(comm, flag);
+}
+
+int MPI_Unpack(void* inbuf, int insize, int* position, void* outbuf, int outcount, MPI_Datatype type, MPI_Comm comm) {
+  return PMPI_Unpack(inbuf, insize, position, outbuf, outcount, type, comm);
+}
+
+int MPI_Type_commit(MPI_Datatype* datatype) {
+  return PMPI_Type_commit(datatype);
+}
+
+int MPI_Type_hindexed(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype old_type, MPI_Datatype* newtype) {
+  return PMPI_Type_hindexed(count, blocklens, indices, old_type, newtype);
+}
+
+int MPI_Type_hvector(int count, int blocklen, MPI_Aint stride, MPI_Datatype old_type, MPI_Datatype* newtype) {
+  return PMPI_Type_hvector(count, blocklen, stride, old_type, newtype);
+}
+
+int MPI_Type_indexed(int count, int* blocklens, int* indices, MPI_Datatype old_type, MPI_Datatype* newtype) {
+  return PMPI_Type_indexed(count, blocklens, indices, old_type, newtype);
+}
+
+int MPI_Type_struct(int count, int* blocklens, MPI_Aint* indices, MPI_Datatype* old_types, MPI_Datatype* newtype) {
+  return PMPI_Type_struct(count, blocklens, indices, old_types, newtype);
+}
+
+int MPI_Type_vector(int count, int blocklen, int stride, MPI_Datatype old_type, MPI_Datatype* newtype) {
+  return PMPI_Type_vector(count, blocklen, stride, old_type, newtype);
+}
+
+int MPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) {
+  return PMPI_Ssend(buf, count, datatype, dest, tag, comm);
+}
+
+int MPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
+  return PMPI_Ssend_init(buf, count, datatype, dest, tag, comm, request);
+}
+
+int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, int remote_leader, int tag, MPI_Comm* comm_out) {
+  return PMPI_Intercomm_create(local_comm, local_leader, peer_comm, remote_leader, tag, comm_out);
+}
+
+int MPI_Intercomm_merge(MPI_Comm comm, int high, MPI_Comm* comm_out) {
+  return PMPI_Intercomm_merge(comm, high, comm_out);
+}
+
+int MPI_Bsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) {
+  return PMPI_Bsend(buf, count, datatype, dest, tag, comm);
+}
+
+int MPI_Bsend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
+  return PMPI_Bsend_init(buf, count, datatype, dest, tag, comm, request);
+}
+
+int MPI_Ibsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
+  return PMPI_Ibsend(buf, count, datatype, dest, tag, comm, request);
+}
+
+int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group* group) {
+  return PMPI_Comm_remote_group(comm, group);
+}
+
+int MPI_Comm_remote_size(MPI_Comm comm, int* size) {
+  return PMPI_Comm_remote_size(comm, size);
+}
+
+int MPI_Issend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
+  return PMPI_Issend(buf, count, datatype, dest, tag, comm, request);
+}
+
+int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) {
+  return PMPI_Probe(source, tag, comm, status);
+}
+
+int MPI_Attr_delete(MPI_Comm comm, int keyval) {
+  return PMPI_Attr_delete(comm, keyval);
+}
+
+int MPI_Attr_get(MPI_Comm comm, int keyval, void* attr_value, int* flag) {
+  return PMPI_Attr_get(comm, keyval, attr_value, flag);
+}
+
+int MPI_Attr_put(MPI_Comm comm, int keyval, void* attr_value) {
+  return PMPI_Attr_put(comm, keyval, attr_value);
+}
+
+int MPI_Rsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) {
+  return PMPI_Rsend(buf, count, datatype, dest, tag, comm);
+}
+
+int MPI_Rsend_init(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
+  return PMPI_Rsend_init(buf, count, datatype, dest, tag, comm, request);
+}
+
+int MPI_Irsend(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, MPI_Request* request) {
+  return PMPI_Irsend(buf, count, datatype, dest, tag, comm, request);
+}
+
+int MPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_fn, int* keyval, void* extra_state) {
+  return PMPI_Keyval_create(copy_fn, delete_fn, keyval, extra_state);
+}
+
+int MPI_Keyval_free(int* keyval) {
+  return PMPI_Keyval_free(keyval);
+}
+
+int MPI_Test_cancelled(MPI_Status* status, int* flag) {
+  return PMPI_Test_cancelled(status, flag);
+}
+
+int MPI_Pack(void* inbuf, int incount, MPI_Datatype type, void* outbuf, int outcount, int* position, MPI_Comm comm) {
+  return PMPI_Pack(inbuf, incount, type, outbuf, outcount, position, comm);
+}
+
+int MPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* statuses) {
+  return PMPI_Testall(count, requests, flag, statuses);
+}
+
+int MPI_Get_elements(MPI_Status* status, MPI_Datatype datatype, int* elements) {
+  return PMPI_Get_elements(status, datatype, elements);
+}
+
+int MPI_Dims_create(int nnodes, int ndims, int* dims) {
+  return PMPI_Dims_create(nnodes, ndims, dims);
+}
+
+int MPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status) {
+  return PMPI_Iprobe(source, tag, comm, flag, status);
+}
+
+int MPI_Initialized(int* flag) {
+  return PMPI_Initialized(flag);
+}