Merging changes done by Steven, Samuel and Luka, regarding simulation of StarPU-MPI

diff --cc include/simgrid/simix.h
Simple merge

diff --cc include/smpi/smpi.h
Simple merge

diff --cc src/simix/smx_global.cpp
index ea20087,7c87387..3ba0e93
--- 1/src/simix/smx_global.cpp
--- 2/src/simix/smx_global.c
+++ b/src/simix/smx_global.cpp
@@@ -48,13 -40,8 +48,15 @@@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_k
  smx_global_t simix_global = NULL;
  static xbt_heap_t simix_timers = NULL;
  
 +/** @brief Timer datatype */
 +typedef struct s_smx_timer {
 +  double date;
 +  void(* func)(void*);
 +  void* args;
 +} s_smx_timer_t;
 +
+ void (*SMPI_switch_data_segment)(int) = NULL;
+ 
  static void* SIMIX_synchro_mallocator_new_f(void);
  static void SIMIX_synchro_mallocator_free_f(void* synchro);
  static void SIMIX_synchro_mallocator_reset_f(void* synchro);

diff --cc src/simix/smx_process.cpp
index b56bae0,61e32f3..bc84eb7
--- 1/src/simix/smx_process.cpp
--- 2/src/simix/smx_process.c
+++ b/src/simix/smx_process.cpp
@@@ -9,10 -9,13 +9,14 @@@
  #include "xbt/log.h"
  #include "xbt/dict.h"
  #include "mc/mc.h"
 -#include "mc/mc_replay.h"
 -#include "mc/mc_client.h"
 +#include "src/mc/mc_replay.h"
 +#include "src/mc/mc_client.h"
 +#include "src/simix/smx_private.hpp"
  
 -#include "smpi/private.h"
+ #ifdef HAVE_SMPI
++#include "src/smpi/private.h"
+ #endif
+ 
  XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
                                  "Logging specific to SIMIX (process)");
  

diff --cc src/smpi/private.h
Simple merge

diff --cc src/smpi/smpi_bench.c
Simple merge

diff --cc src/smpi/smpi_global.c
index 4001323,dd252f8..295ddfb
--- 1/src/smpi/smpi_global.c
--- 2/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@@ -7,12 -7,13 +7,13 @@@
  #include "private.h"
  #include "smpi_mpi_dt_private.h"
  #include "mc/mc.h"
 -#include "mc/mc_record.h"
 +#include "src/mc/mc_record.h"
  #include "xbt/replay.h"
  #include "surf/surf.h"
 -#include "simix/smx_private.h"
 +#include "src/simix/smx_private.h"
  #include "simgrid/sg_config.h"
 -#include "mc/mc_replay.h"
 -#include "msg/msg_private.h"
 +#include "src/mc/mc_replay.h"
++#include "src/msg/msg_private.h"
  
  #include <float.h>              /* DBL_MAX */
  #include <stdint.h>
@@@ -79,10 -80,11 +80,11 @@@ void smpi_process_init(int *argc, char 
    if (argc && argv) {
      proc = SIMIX_process_self();
      //FIXME: dirty cleanup method to avoid using msg cleanup functions on these processes when using MSG+SMPI
 -    proc->context->cleanup_func=SIMIX_process_cleanup;
 +    SIMIX_process_set_cleanup_function(proc, SIMIX_process_cleanup);
      char* instance_id = (*argv)[1];
      int rank = atoi((*argv)[2]);
-     index = smpi_process_index_of_smx_process(proc);
+     /* Now using segment index of the process */
+     index = proc->segment_index;
  
      if(!index_to_process_data){
        index_to_process_data=(int*)xbt_malloc(SIMIX_process_count()*sizeof(int));

diff --cc src/smpi/smpi_pmpi.c
Simple merge