Merge back master branch.

Conflicts:
	src/smpi/smpi_bench.c

diff --combined src/smpi/smpi_bench.c
index 2a38ef7,e531e85..b9d6366
--- 1/src/smpi/smpi_bench.c
--- 2/src/smpi/smpi_bench.c
+++ b/src/smpi/smpi_bench.c
@@@ -7,6 -7,7 +7,7 @@@
  #include "private.h"
  #include "xbt/dict.h"
  #include "xbt/sysdep.h"
+ #include "xbt/ex.h"
  #include "surf/surf.h"
  
  XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi,
@@@ -14,7 -15,7 +15,8 @@@
  
  xbt_dict_t allocs = NULL;       /* Allocated on first use */
  xbt_dict_t samples = NULL;      /* Allocated on first use */
+ xbt_dict_t calls = NULL;        /* Allocated on first use */
 +__thread int smpi_current_rank = 0;      /* Updated after each MPI call */
  
  typedef struct {
    int count;
@@@ -40,6 -41,9 +42,9 @@@ void smpi_bench_destroy(void
    if (samples) {
      xbt_dict_free(&samples);
    }
+   if(calls) {
+     xbt_dict_free(&calls);
+   }
  }
  
  static void smpi_execute_flops(double flops)
@@@ -69,7 -73,6 +74,7 @@@ static void smpi_execute(double duratio
  void smpi_bench_begin(void)
  {
    xbt_os_timer_start(smpi_process_timer());
 +  smpi_current_rank = smpi_process_index();
  }
  
  void smpi_bench_end(void)
@@@ -225,3 -228,49 +230,49 @@@ void smpi_shared_free(void *ptr
      xbt_dict_remove(allocs, loc);
    }
  }
+ 
+ int smpi_shared_known_call(const char* func, const char* input) {
+    char* loc = bprintf("%s:%s", func, input);
+    xbt_ex_t ex;
+    int known;
+ 
+    if(!calls) {
+       calls = xbt_dict_new();
+    }
+    TRY {
+       xbt_dict_get(calls, loc); /* Succeed or throw */
+       known = 1;
+    } CATCH(ex) {
+       if(ex.category == not_found_error) {
+          known = 0;
+          xbt_ex_free(ex);
+       } else {
+          RETHROW;
+       }
+    }
+    free(loc);
+    return known;
+ }
+ 
+ void* smpi_shared_get_call(const char* func, const char* input) {
+    char* loc = bprintf("%s:%s", func, input);
+    void* data;
+ 
+    if(!calls) {
+       calls = xbt_dict_new();
+    }
+    data = xbt_dict_get(calls, loc);
+    free(loc);
+    return data;
+ }
+ 
+ void* smpi_shared_set_call(const char* func, const char* input, void* data) {
+    char* loc = bprintf("%s:%s", func, input);
+ 
+    if(!calls) {
+       calls = xbt_dict_new();
+    }
+    xbt_dict_set(calls, loc, data, NULL);
+    free(loc);
+    return data;
+ }