Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --combined src/simix/ActorImpl.cpp
index d14628a,63bef05..d2b51d4
--- 1/src/simix/ActorImpl.cpp
--- 2/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@@ -146,6 -146,9 +146,6 @@@ void SIMIX_process_empty_trash(
  
  namespace simgrid {
  
 -namespace s4u {
 -simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::onCreation; // TODO cheinrich is this the right location here?
 -}
  namespace simix {
  
  ActorImpl::~ActorImpl()
@@@ -322,16 -325,6 +322,6 @@@ smx_actor_t SIMIX_process_create(const 
  
    if (parent_process != nullptr) {
      process->ppid = parent_process->pid;
- /* SMPI process have their own data segment and each other inherit from their father */
- #if HAVE_SMPI
-     if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
-       if (parent_process->pid != 0) {
-         process->segment_index = parent_process->segment_index;
-       } else {
-         process->segment_index = process->pid - 1;
-       }
-     }
- #endif
    }
  
    process->code         = code;
@@@ -395,16 -388,6 +385,6 @@@ smx_actor_t SIMIX_process_attach(const 
  
    if (parent_process != nullptr) {
      process->ppid = parent_process->pid;
-     /* SMPI process have their own data segment and each other inherit from their father */
- #if HAVE_SMPI
-     if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP) {
-       if (parent_process->pid != 0) {
-         process->segment_index = parent_process->segment_index;
-       } else {
-         process->segment_index = process->pid - 1;
-       }
-     }
- #endif
    }
  
    /* Process data for auto-restart */
@@@ -780,8 -763,8 +760,8 @@@ void SIMIX_process_yield(smx_actor_t se
      std::rethrow_exception(std::move(exception));
    }
  
-   if(SMPI_switch_data_segment && self->segment_index != -1){
-     SMPI_switch_data_segment(self->segment_index);
+   if(SMPI_switch_data_segment){
+     SMPI_switch_data_segment(self->pid);
    }
  }