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

diff --git a/src/smpi/smpi_mpi.c b/src/smpi/smpi_mpi.c
index 6258fd9469..27dc945f80 100644
--- a/src/smpi/smpi_mpi.c
+++ b/src/smpi/smpi_mpi.c
@@ -1,4 +1,8 @@
-/* $Id$tag */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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 "private.h"
 #include "smpi_coll_private.h"
@@ -7,274 +11,373 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_mpi, smpi,
                                 "Logging specific to SMPI (mpi)");
 
+#ifdef HAVE_TRACING
+//this function need to be here because of the calls to smpi_bench
+int TRACE_smpi_set_category(const char *category)
+{
+  //need to end bench otherwise categories for execution tasks are wrong
+  smpi_bench_end (-1, NULL);
+  int ret;
+  if (!IS_TRACING){
+    ret = 1;
+  }else{
+    if (category != NULL) {
+      ret = TRACE_category(category);
+      TRACE_category_set(SIMIX_process_self(), category);
+    }else{
+      //if category is NULL, trace of platform is disabled for this process
+      TRACE_category_unset(SIMIX_process_self());
+      ret = 0;
+    }
+  }
+  //begin bench after changing process's category
+  smpi_bench_begin (-1, NULL);
+  return ret;
+}
+#endif
+
 /* MPI User level calls */
 
-int MPI_Init(int* argc, char*** argv) {
+int MPI_Init(int *argc, char ***argv)
+{
   smpi_process_init(argc, argv);
-  smpi_bench_begin(NULL);
+#ifdef HAVE_TRACING
+  TRACE_smpi_init(smpi_process_index());
+#endif
+  smpi_bench_begin(-1, NULL);
   return MPI_SUCCESS;
 }
 
-int MPI_Finalize(void) {
-  smpi_bench_end();
+int MPI_Finalize(void)
+{
+  smpi_bench_end(-1, NULL);
+#ifdef HAVE_TRACING
+  TRACE_smpi_finalize(smpi_process_index());
+#endif
   smpi_process_destroy();
   return MPI_SUCCESS;
 }
 
-int MPI_Init_thread(int* argc, char*** argv, int required, int* provided) {
-  if(provided != NULL) {
+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 MPI_Query_thread(int *provided)
+{
   int retval;
 
-  smpi_bench_end();
-  if(provided == NULL) {
+  smpi_bench_end(-1, NULL);
+  if (provided == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *provided = MPI_THREAD_MULTIPLE;
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Query_thread");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Is_thread_main(int* flag) {
+int MPI_Is_thread_main(int *flag)
+{
   int retval;
 
-  smpi_bench_end();
-  if(flag == NULL) {
+  smpi_bench_end(-1, NULL);
+  if (flag == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *flag = smpi_process_index() == 0;
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Is_thread_main");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Abort(MPI_Comm comm, int errorcode) {
-  smpi_bench_end();
+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 MPI_Wtime(void)
+{
   double time;
 
-  smpi_bench_end();
+  smpi_bench_end(-1, NULL);
   time = SIMIX_get_clock();
-  smpi_bench_begin("MPI_Wtime");
+  smpi_bench_begin(-1, NULL);
   return time;
 }
 
-int MPI_Type_size(MPI_Datatype datatype, size_t* size) {
+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();
-  if(datatype == MPI_DATATYPE_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (!datatype) {
+    retval = MPI_ERR_ARG;
+  } else {
+    // FIXME: always fail for now
     retval = MPI_ERR_TYPE;
-  } else if(size == NULL) {
+  }
+  smpi_bench_begin(-1, NULL);
+  return retval;
+}
+
+int MPI_Type_size(MPI_Datatype datatype, int *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);
+    *size = (int) smpi_datatype_size(datatype);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Type_size");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint* lb, MPI_Aint* extent) {
+int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint * lb,
+                        MPI_Aint * extent)
+{
   int retval;
 
-  smpi_bench_end();
-  if(datatype == MPI_DATATYPE_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (datatype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(lb == NULL || extent == NULL) {
+  } else if (lb == NULL || extent == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     retval = smpi_datatype_extent(datatype, lb, extent);
   }
-  smpi_bench_begin("MPI_Type_get_extent");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint* disp) {
+int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint * extent)
+{
   int retval;
+  MPI_Aint dummy;
 
-  smpi_bench_end();
-  if(datatype == MPI_DATATYPE_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (datatype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(disp == NULL) {
+  } 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("MPI_Type_lb");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint* disp) {
+int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint * disp)
+{
   int retval;
 
-  smpi_bench_end();
-  if(datatype == MPI_DATATYPE_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (datatype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(disp == NULL) {
+  } else if (disp == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *disp = smpi_datatype_ub(datatype);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Type_ub");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Op_create(MPI_User_function* function, int commute, MPI_Op* op) {
+int MPI_Op_create(MPI_User_function * function, int commute, MPI_Op * op)
+{
   int retval;
 
-  smpi_bench_end();
-  if(function == NULL || op == NULL) {
+  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("MPI_Op_create");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Op_free(MPI_Op* op) {
+int MPI_Op_free(MPI_Op * op)
+{
   int retval;
 
-  smpi_bench_end();
-  if(op == NULL) {
+  smpi_bench_end(-1, NULL);
+  if (op == NULL) {
     retval = MPI_ERR_ARG;
-  } else if(*op == MPI_OP_NULL) {
+  } 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("MPI_Op_free");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_free(MPI_Group *group) {
+int MPI_Group_free(MPI_Group * group)
+{
   int retval;
 
-  smpi_bench_end();
-  if(group == NULL) {
+  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("MPI_Group_free");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_size(MPI_Group group, int* size) {
+int MPI_Group_size(MPI_Group group, int *size)
+{
   int retval;
 
-  smpi_bench_end();
-  if(group == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(size == NULL) {
+  } else if (size == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *size = smpi_group_size(group);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_size");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_rank(MPI_Group group, int* rank) {
+int MPI_Group_rank(MPI_Group group, int *rank)
+{
   int retval;
 
-  smpi_bench_end();
-  if(group == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(rank == NULL) {
+  } else if (rank == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *rank = smpi_group_rank(group, smpi_process_index());
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_rank");
+  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 MPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
+                              MPI_Group group2, int *ranks2)
+{
   int retval, i, index;
 
-  smpi_bench_end();
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
+  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++) {
+    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("MPI_Group_translate_ranks");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int* result) {
+int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result)
+{
   int retval;
 
-  smpi_bench_end();
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(result == NULL) {
+  } else if (result == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *result = smpi_group_compare(group1, group2);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_compare");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) {
+int MPI_Group_union(MPI_Group group1, MPI_Group group2,
+                    MPI_Group * newgroup)
+{
   int retval, i, proc1, proc2, size, size2;
 
-  smpi_bench_end();
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } 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++) {
+    for (i = 0; i < size2; i++) {
       proc2 = smpi_group_index(group2, i);
       proc1 = smpi_group_rank(group1, proc2);
-      if(proc1 == MPI_UNDEFINED) {
+      if (proc1 == MPI_UNDEFINED) {
         size++;
       }
     }
-    if(size == 0) {
+    if (size == 0) {
       *newgroup = MPI_GROUP_EMPTY;
     } else {
       *newgroup = smpi_group_new(size);
       size2 = smpi_group_size(group1);
-      for(i = 0; i < size2; i++) {
+      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++) {
+      for (i = size2; i < size; i++) {
         proc2 = smpi_group_index(group2, i - size2);
         smpi_group_set_mapping(*newgroup, proc2, i);
       }
@@ -282,37 +385,39 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) {
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_union");
+  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;
+int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
+                           MPI_Group * newgroup)
+{
+  int retval, i, proc1, proc2, size, size2;
 
-  smpi_bench_end();
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } 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++) {
+    for (i = 0; i < size2; i++) {
       proc2 = smpi_group_index(group2, i);
       proc1 = smpi_group_rank(group1, proc2);
-      if(proc1 == MPI_UNDEFINED) {
+      if (proc1 == MPI_UNDEFINED) {
         size--;
       }
     }
-    if(size == 0) {
+    if (size == 0) {
       *newgroup = MPI_GROUP_EMPTY;
     } else {
       *newgroup = smpi_group_new(size);
       size2 = smpi_group_size(group1);
-      for(i = 0; i < size2; i++) {
+      for (i = 0; i < size2; i++) {
         proc1 = smpi_group_index(group1, i);
         proc2 = smpi_group_rank(group2, proc1);
-        if(proc2 != MPI_UNDEFINED) {
+        if (proc2 != MPI_UNDEFINED) {
           smpi_group_set_mapping(*newgroup, proc1, i);
         }
       }
@@ -320,35 +425,37 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group* newgro
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_intersection");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup) {
+int MPI_Group_difference(MPI_Group group1, MPI_Group group2,
+                         MPI_Group * newgroup)
+{
   int retval, i, proc1, proc2, size, size2;
 
-  smpi_bench_end();
-  if(group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group1 == MPI_GROUP_NULL || group2 == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } else if (newgroup == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     size = size2 = smpi_group_size(group1);
-    for(i = 0; i < size2; i++) {
+    for (i = 0; i < size2; i++) {
       proc1 = smpi_group_index(group1, i);
       proc2 = smpi_group_rank(group2, proc1);
-      if(proc2 != MPI_UNDEFINED) {
+      if (proc2 != MPI_UNDEFINED) {
         size--;
       }
     }
-    if(size == 0) {
+    if (size == 0) {
       *newgroup = MPI_GROUP_EMPTY;
     } else {
       *newgroup = smpi_group_new(size);
-      for(i = 0; i < size2; i++) {
+      for (i = 0; i < size2; i++) {
         proc1 = smpi_group_index(group1, i);
         proc2 = smpi_group_rank(group2, proc1);
-        if(proc2 == MPI_UNDEFINED) {
+        if (proc2 == MPI_UNDEFINED) {
           smpi_group_set_mapping(*newgroup, proc1, i);
         }
       }
@@ -356,26 +463,28 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group* newgroup
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_difference");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) {
+int MPI_Group_incl(MPI_Group group, int n, int *ranks,
+                   MPI_Group * newgroup)
+{
   int retval, i, index;
 
-  smpi_bench_end();
-  if(group == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } else if (newgroup == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    if(n == 0) {
+    if (n == 0) {
       *newgroup = MPI_GROUP_EMPTY;
-    } else if(n == smpi_group_size(group)) {
+    } else if (n == smpi_group_size(group)) {
       *newgroup = group;
     } else {
       *newgroup = smpi_group_new(n);
-      for(i = 0; i < n; i++) {
+      for (i = 0; i < n; i++) {
         index = smpi_group_index(group, ranks[i]);
         smpi_group_set_mapping(*newgroup, index, i);
       }
@@ -383,34 +492,36 @@ int MPI_Group_incl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) {
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_incl");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_excl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) {
+int MPI_Group_excl(MPI_Group group, int n, int *ranks,
+                   MPI_Group * newgroup)
+{
   int retval, i, size, rank, index;
 
-  smpi_bench_end();
-  if(group == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } else if (newgroup == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    if(n == 0) {
+    if (n == 0) {
       *newgroup = group;
-    } else if(n == smpi_group_size(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) {
+      while (rank < size) {
+        for (i = 0; i < n; i++) {
+          if (ranks[i] == rank) {
             break;
           }
         }
-        if(i >= n) {
+        if (i >= n) {
           index = smpi_group_index(group, rank);
           smpi_group_set_mapping(*newgroup, index, rank);
           rank++;
@@ -420,39 +531,41 @@ int MPI_Group_excl(MPI_Group group, int n, int* ranks, MPI_Group* newgroup) {
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_excl");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup) {
+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();
-  if(group == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } else if (newgroup == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    if(n == 0) {
+    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 */) {
+      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)) {
+      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 */) {
+        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++;
@@ -463,47 +576,49 @@ int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group* new
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_range_incl");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group* newgroup) {
+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();
-  if(group == MPI_GROUP_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newgroup == NULL) {
+  } else if (newgroup == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    if(n == 0) {
+    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 */) {
+      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) {
+      if (size == 0) {
         *newgroup = MPI_GROUP_EMPTY;
       } else {
         *newgroup = smpi_group_new(size);
         newrank = 0;
-        while(newrank < size) {
-          for(i = 0; i < n; i++) {
+        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) {
+            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) {
+            if (add == 1) {
               index = smpi_group_index(group, newrank);
               smpi_group_set_mapping(*newgroup, index, newrank);
             }
@@ -514,513 +629,1050 @@ int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group* new
     smpi_group_use(*newgroup);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Group_range_excl");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_rank(MPI_Comm comm, int* rank) {
+int MPI_Comm_rank(MPI_Comm comm, int *rank)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  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("MPI_Comm_rank");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_size(MPI_Comm comm, int* size) {
+int MPI_Comm_size(MPI_Comm comm, int *size)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(size == NULL) {
+  } else if (size == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *size = smpi_comm_size(comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Comm_size");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_group(MPI_Comm comm, MPI_Group* group) {
+int MPI_Comm_group(MPI_Comm comm, MPI_Group * group)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(group == NULL) {
+  } else if (group == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *group = smpi_comm_group(comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Comm_group");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int* result) {
+int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm1 == MPI_COMM_NULL || comm2 == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(result == NULL) {
+  } else if (result == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    if(comm1 == comm2) { /* Same communicators means same groups */
+    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 =
+          smpi_group_compare(smpi_comm_group(comm1),
+                             smpi_comm_group(comm2));
+      if (*result == MPI_IDENT) {
         *result = MPI_CONGRUENT;
       }
     }
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Comm_compare");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_dup(MPI_Comm comm, MPI_Comm* newcomm) {
+int MPI_Comm_dup(MPI_Comm comm, MPI_Comm * newcomm)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(newcomm == NULL) {
+  } else if (newcomm == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *newcomm = smpi_comm_new(smpi_comm_group(comm));
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Comm_dup");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm* newcomm) {
+int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(group == MPI_GROUP_NULL) {
+  } else if (group == MPI_GROUP_NULL) {
     retval = MPI_ERR_GROUP;
-  } else if(newcomm == NULL) {
+  } else if (newcomm == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *newcomm = smpi_comm_new(group);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Comm_create");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Comm_free(MPI_Comm* comm) {
+int MPI_Comm_free(MPI_Comm * comm)
+{
   int retval;
 
-  smpi_bench_end();
-  if(comm == NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm == NULL) {
     retval = MPI_ERR_ARG;
-  } else if(*comm == MPI_COMM_NULL) {
+  } 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("MPI_Comm_free");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Irecv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request* request) {
+int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm* comm_out)
+{
   int retval;
 
-  smpi_bench_end();
-  if(request == NULL) {
+  smpi_bench_end(-1, NULL);
+  if (comm_out == 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);
+    *comm_out = smpi_comm_split(comm, color, key);
+    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("MPI_Irecv");
+  smpi_bench_begin(rank, "Recv_init");
   return retval;
 }
 
-int MPI_Isend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) {
+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();
-  if(request == NULL) {
+  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;
+
+  smpi_bench_end(rank, "Irecv");
+#ifdef HAVE_TRACING
+  int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
+  TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__);
+#endif
+  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;
+  }
+#ifdef HAVE_TRACING
+  TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
+  (*request)->recv = 1;
+#endif
+  smpi_bench_begin(rank, "Irecv");
+  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;
+
+  smpi_bench_end(rank, "Isend");
+#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
+  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("MPI_Isend");
+#ifdef HAVE_TRACING
+  TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
+  (*request)->send = 1;
+#endif
+  smpi_bench_begin(rank, "Isend");
   return retval;
 }
 
-int MPI_Recv(void* buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status* status) {
-  smpi_bench_end();
-  smpi_mpi_recv(buf, count, datatype, src, tag, comm, status);
-  smpi_bench_begin("MPI_Recv");
-  return MPI_SUCCESS;
+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;
+
+  smpi_bench_end(rank, "Recv");
+#ifdef HAVE_TRACING
+  int src_traced = smpi_group_rank(smpi_comm_group(comm), src);
+  TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
+    retval = MPI_ERR_COMM;
+  } else {
+    smpi_mpi_recv(buf, count, datatype, src, tag, comm, status);
+    retval = MPI_SUCCESS;
+  }
+#ifdef HAVE_TRACING
+  TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__);
+  TRACE_smpi_recv(rank, src_traced, rank);
+#endif
+  smpi_bench_begin(rank, "Recv");
+  return retval;
 }
 
-int MPI_Send(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) {
-  smpi_bench_end();
-  smpi_mpi_send(buf, count, datatype, dst, tag, comm);
-  smpi_bench_begin("MPI_Send");
-  return MPI_SUCCESS;
+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;
+
+  smpi_bench_end(rank, "Send");
+#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
+  if (comm == MPI_COMM_NULL) {
+    retval = MPI_ERR_COMM;
+  } else {
+    smpi_mpi_send(buf, count, datatype, dst, tag, comm);
+    retval = MPI_SUCCESS;
+  }
+#ifdef HAVE_TRACING
+  TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Send");
+  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) {
-  smpi_bench_end();
-  smpi_mpi_sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status);
-  smpi_bench_begin("MPI_Sendrecv");
-  return MPI_SUCCESS;
+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;
+
+  smpi_bench_end(rank, "Sendrecv");
+#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
+  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;
+  }
+#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
+  smpi_bench_begin(rank, "Sendrecv");
+  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) {
+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;
+  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);
+  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 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();
-  if(request == NULL || flag == NULL) {
+  smpi_bench_end(rank, "Test");
+  if (request == NULL || flag == NULL) {
     retval = MPI_ERR_ARG;
-  } else if(*request == MPI_REQUEST_NULL) {
+  } else if (*request == MPI_REQUEST_NULL) {
     retval = MPI_ERR_REQUEST;
   } else {
     *flag = smpi_mpi_test(request, status);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Test");
+  smpi_bench_begin(rank, "Test");
   return retval;
 }
 
-int MPI_Testany(int count, MPI_Request requests[], int* index, int* flag, MPI_Status* status) {
+int MPI_Testany(int count, MPI_Request requests[], int *index, int *flag,
+                MPI_Status * status)
+{
   int retval;
 
-  smpi_bench_end();
-  if(index == NULL || flag == NULL) {
+  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("MPI_Testany");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Wait(MPI_Request* request, MPI_Status* status) {
+int MPI_Wait(MPI_Request * request, MPI_Status * status)
+{
   int retval;
-
-  smpi_bench_end();
-  if(request == NULL) {
+  int rank = request && (*request)->comm != MPI_COMM_NULL
+      ? smpi_comm_rank((*request)->comm)
+      : -1;
+
+  smpi_bench_end(rank, "Wait");
+#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
+  if (request == NULL) {
     retval = MPI_ERR_ARG;
-  } else if(*request == MPI_REQUEST_NULL) {
+  } else if (*request == MPI_REQUEST_NULL) {
     retval = MPI_ERR_REQUEST;
   } else {
     smpi_mpi_wait(request, status);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_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
+  smpi_bench_begin(rank, "Wait");
   return retval;
 }
 
-int MPI_Waitany(int count, MPI_Request requests[], int* index, MPI_Status* status) {
+int MPI_Waitany(int count, MPI_Request requests[], int *index,
+                MPI_Status * status)
+{
   int retval;
 
-  smpi_bench_end();
-  if(index == NULL) {
+  smpi_bench_end(-1, NULL);     //FIXME
+#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);
+    }
+  }
+  int rank_traced = smpi_comm_rank(MPI_COMM_WORLD);
+  TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
+#endif
+  if (index == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     *index = smpi_mpi_waitany(count, requests, status);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Waitany");
+#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
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Waitall(int count, MPI_Request requests[],  MPI_Status status[]) {
-  smpi_bench_end();
+int MPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
+{
+
+  smpi_bench_end(-1, NULL);     //FIXME
+#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);
+  }
+  int rank_traced = smpi_comm_rank (MPI_COMM_WORLD);
+  TRACE_smpi_ptp_in(rank_traced, -1, -1, __FUNCTION__);
+#endif
   smpi_mpi_waitall(count, requests, status);
-  smpi_bench_begin("MPI_Waitall");
+#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
+  smpi_bench_begin(-1, NULL);
   return MPI_SUCCESS;
 }
 
-int MPI_Waitsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) {
+int MPI_Waitsome(int incount, MPI_Request requests[], int *outcount,
+                 int *indices, MPI_Status status[])
+{
   int retval;
 
-  smpi_bench_end();
-  if(outcount == NULL || indices == NULL) {
+  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("MPI_Waitsome");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }
 
-int MPI_Bcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm) {
+int MPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root,
+              MPI_Comm comm)
+{
   int retval;
-
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+
+  smpi_bench_end(rank, "Bcast");
+#ifdef HAVE_TRACING
+  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+  TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
   } else {
     smpi_mpi_bcast(buf, count, datatype, root, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Bcast");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Bcast");
   return retval;
 }
 
-int MPI_Barrier(MPI_Comm comm) {
+int MPI_Barrier(MPI_Comm comm)
+{
   int retval;
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(rank, "Barrier");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
   } else {
     smpi_mpi_barrier(comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Barrier");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Barrier");
   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 MPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+               void *recvbuf, int recvcount, MPI_Datatype recvtype,
+               int root, MPI_Comm comm)
+{
   int retval;
-
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+
+  smpi_bench_end(rank, "Gather");
+#ifdef HAVE_TRACING
+  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+  TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } 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);
+    smpi_mpi_gather(sendbuf, sendcount, sendtype, recvbuf, recvcount,
+                    recvtype, root, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Gather");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Gather");
   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 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;
-
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+
+  smpi_bench_end(rank, "Gatherv");
+#ifdef HAVE_TRACING
+  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+  TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } else if (sendtype == MPI_DATATYPE_NULL
+             || recvtype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(recvcounts == NULL || displs == NULL) {
+  } else if (recvcounts == NULL || displs == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    smpi_mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, root, comm);
+    smpi_mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts,
+                     displs, recvtype, root, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Gatherv");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Gatherv");
   return retval;
 }
 
-int MPI_Allgather(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
+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;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(rank, "Allgather");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } 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);
+    smpi_mpi_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount,
+                       recvtype, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Allgather");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Allgather");
   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 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;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(rank, "Allgatherv");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } else if (sendtype == MPI_DATATYPE_NULL
+             || recvtype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(recvcounts == NULL || displs == NULL) {
+  } else if (recvcounts == NULL || displs == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    smpi_mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm);
+    smpi_mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts,
+                        displs, recvtype, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Allgatherv");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Allgatherv");
   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 MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
+                void *recvbuf, int recvcount, MPI_Datatype recvtype,
+                int root, MPI_Comm comm)
+{
   int retval;
-
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+
+  smpi_bench_end(rank, "Scatter");
+#ifdef HAVE_TRACING
+  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+  TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } 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);
+    smpi_mpi_scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount,
+                     recvtype, root, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Scatter");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Scatter");
   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 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;
-
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+
+  smpi_bench_end(rank, "Scatterv");
+#ifdef HAVE_TRACING
+  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+  TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } else if (sendtype == MPI_DATATYPE_NULL
+             || recvtype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(sendcounts == NULL || displs == NULL) {
+  } else if (sendcounts == NULL || displs == NULL) {
     retval = MPI_ERR_ARG;
   } else {
-    smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm);
+    smpi_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf,
+                      recvcount, recvtype, root, comm);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Scatterv");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Scatterv");
   return retval;
 }
 
-int MPI_Reduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) {
+int MPI_Reduce(void *sendbuf, void *recvbuf, int count,
+               MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm)
+{
   int retval;
-
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  int rank = comm != MPI_COMM_NULL ? smpi_comm_rank(comm) : -1;
+
+  smpi_bench_end(rank, "Reduce");
+#ifdef HAVE_TRACING
+  int root_traced = smpi_group_rank(smpi_comm_group(comm), root);
+  TRACE_smpi_collective_in(rank, root_traced, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL || op == MPI_OP_NULL) {
+  } 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("MPI_Reduce");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, root_traced, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Reduce");
   return retval;
 }
 
-int MPI_Allreduce(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) {
+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;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(rank, "Allreduce");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL) {
+  } else if (datatype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(op == MPI_OP_NULL) {
+  } 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("MPI_Allreduce");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Allreduce");
   return retval;
 }
 
-int MPI_Reduce_scatter(void* sendbuf, void* recvbuf, int* recvcounts, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) {
-  int retval, i, rank, size, count;
-  int* displs;
+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;
+
+  smpi_bench_end(rank, "Scan");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  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;
+  }
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Scan");
+  return retval;
+}
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+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;
+
+  smpi_bench_end(rank, "Reduce_scatter");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(datatype == MPI_DATATYPE_NULL) {
+  } else if (datatype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(op == MPI_OP_NULL) {
+  } else if (op == MPI_OP_NULL) {
     retval = MPI_ERR_OP;
-  } else if(recvcounts == NULL) {
+  } else if (recvcounts == NULL) {
     retval = MPI_ERR_ARG;
   } else {
     /* arbitrarily choose root as rank 0 */
     /* TODO: faster direct implementation ? */
-    rank = smpi_comm_rank(comm);
     size = smpi_comm_size(comm);
     count = 0;
     displs = xbt_new(int, size);
-    for(i = 0; i < size; i++) {
+    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);
+    smpi_mpi_scatterv(recvbuf, recvcounts, displs, datatype, recvbuf,
+                      recvcounts[rank], datatype, 0, comm);
     xbt_free(displs);
     retval = MPI_SUCCESS;
   }
-  smpi_bench_begin("MPI_Reduce_scatter");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Reduce_scatter");
   return retval;
 }
 
-/**
- * MPI_Alltoall user entry point
- * 
- * Uses the logic of OpenMPI (upto 1.2.7 or greater) for the optimizations
- * ompi/mca/coll/tuned/coll_tuned_module.c
- **/
-
-int MPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) {
+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;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(rank, "Alltoall");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } 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);
+    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);
+      retval =
+          smpi_coll_tuned_alltoall_pairwise(sendbuf, sendcount, sendtype,
+                                            recvbuf, recvcount, recvtype,
+                                            comm);
     }
   }
-  smpi_bench_begin("MPI_Alltoall");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Alltoall");
   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 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;
 
-  smpi_bench_end();
-  if(comm == MPI_COMM_NULL) {
+  smpi_bench_end(rank, "Alltoallv");
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_in(rank, -1, __FUNCTION__);
+#endif
+  if (comm == MPI_COMM_NULL) {
     retval = MPI_ERR_COMM;
-  } else if(sendtype == MPI_DATATYPE_NULL || recvtype == MPI_DATATYPE_NULL) {
+  } else if (sendtype == MPI_DATATYPE_NULL
+             || recvtype == MPI_DATATYPE_NULL) {
     retval = MPI_ERR_TYPE;
-  } else if(sendcounts == NULL || senddisps == NULL || recvcounts == NULL || recvdisps == NULL) {
+  } 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); 
+    retval =
+        smpi_coll_basic_alltoallv(sendbuf, sendcounts, senddisps, sendtype,
+                                  recvbuf, recvcounts, recvdisps, recvtype,
+                                  comm);
+  }
+#ifdef HAVE_TRACING
+  TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
+#endif
+  smpi_bench_begin(rank, "Alltoallv");
+  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_Get_count(MPI_Status * status, MPI_Datatype datatype, int *count)
+{
+  int retval = MPI_SUCCESS;
+  size_t size;
+
+  smpi_bench_end(-1, NULL);
+  if (status == NULL || count == NULL) {
+    retval = MPI_ERR_ARG;
+  } else if (datatype == MPI_DATATYPE_NULL) {
+    retval = MPI_ERR_TYPE;
+  } else {
+    size = smpi_datatype_size(datatype);
+    if (size == 0) {
+      *count = 0;
+    } else if (status->count % size != 0) {
+      retval = MPI_UNDEFINED;
+    } else {
+      *count = smpi_mpi_get_count(status, datatype);
+    }
   }
-  smpi_bench_begin("MPI_Alltoallv");
+  smpi_bench_begin(-1, NULL);
   return retval;
 }