X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7571100729971aa089eb33af2f93a5177fc83757..d919680dd6d792fccc5cab4ace6fbe93974919cd:/src/simix/smx_process.cpp

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index aecd61f01b..724353594a 100644
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -11,15 +11,18 @@
 #include "xbt/dict.h"
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
-#include "src/mc/mc_client.h"
-#include "src/simix/smx_private.hpp"
+#include "src/mc/Client.hpp"
+#include "src/msg/msg_private.h"
+
+#include "src/simix/SynchroSleep.hpp"
+#include "src/simix/SynchroRaw.hpp"
+#include "src/simix/SynchroIo.hpp"
 
 #ifdef HAVE_SMPI
 #include "src/smpi/private.h"
 #endif
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
-                                "Logging specific to SIMIX (process)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
 
 unsigned long simix_process_maxpid = 0;
 
@@ -34,7 +37,7 @@ smx_process_t SIMIX_process_self(void)
 {
   smx_context_t self_context = SIMIX_context_self();
 
-  return self_context ? SIMIX_context_get_process(self_context) : NULL;
+  return self_context ? self_context->process() : NULL;
 }
 
 /**
@@ -52,57 +55,57 @@ int SIMIX_process_has_pending_comms(smx_process_t process) {
 void SIMIX_process_cleanup(smx_process_t process)
 {
   XBT_DEBUG("Cleanup process %s (%p), waiting synchro %p",
-      process->name, process, process->waiting_synchro);
+      process->name.c_str(), process, process->waiting_synchro);
 
   SIMIX_process_on_exit_runall(process);
 
   /* Unregister from the kill timer if any */
   if (process->kill_timer != NULL)
-	  SIMIX_timer_remove(process->kill_timer);
+      SIMIX_timer_remove(process->kill_timer);
 
   xbt_os_mutex_acquire(simix_global->mutex);
 
   /* cancel non-blocking communications */
   smx_synchro_t synchro;
   while ((synchro = (smx_synchro_t) xbt_fifo_pop(process->comms))) {
+    simgrid::simix::Comm *comm = static_cast<simgrid::simix::Comm*>(synchro);
 
     /* make sure no one will finish the comm after this process is destroyed,
      * because src_proc or dst_proc would be an invalid pointer */
-    SIMIX_comm_cancel(synchro);
+    comm->cancel();
 
-    if (synchro->comm.src_proc == process) {
+    if (comm->src_proc == process) {
       XBT_DEBUG("Found an unfinished send comm %p (detached = %d), state %d, src = %p, dst = %p",
-          synchro, synchro->comm.detached, (int)synchro->state, synchro->comm.src_proc, synchro->comm.dst_proc);
-      synchro->comm.src_proc = NULL;
+          comm, comm->detached, (int)comm->state, comm->src_proc, comm->dst_proc);
+      comm->src_proc = NULL;
 
       /* I'm not supposed to destroy a detached comm from the sender side, */
-      if (!synchro->comm.detached)
-        SIMIX_comm_destroy(synchro);
+      if (comm->detached)
+        XBT_DEBUG("Don't destroy it since it's a detached comm and I'm the sender");
       else
-        XBT_DEBUG("Don't destroy it since it's a detached comm");
+        comm->unref();
 
     }
-    else if (synchro->comm.dst_proc == process){
+    else if (comm->dst_proc == process){
       XBT_DEBUG("Found an unfinished recv comm %p, state %d, src = %p, dst = %p",
-          synchro, (int)synchro->state, synchro->comm.src_proc, synchro->comm.dst_proc);
-      synchro->comm.dst_proc = NULL;
+          comm, (int)comm->state, comm->src_proc, comm->dst_proc);
+      comm->dst_proc = NULL;
 
-      if (synchro->comm.detached && synchro->comm.refcount == 1
-          && synchro->comm.src_proc != NULL) {
+      if (comm->detached && comm->src_proc != NULL) {
         /* the comm will be freed right now, remove it from the sender */
-        xbt_fifo_remove(synchro->comm.src_proc->comms, synchro);
+        xbt_fifo_remove(comm->src_proc->comms, comm);
       }
-      SIMIX_comm_destroy(synchro);
-    }
-    else {
-      xbt_die("Communication synchro %p is in my list but I'm not the sender "
-          "or the receiver", synchro);
+      
+      comm->unref();
+    } else {
+      xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
     }
   }
 
   XBT_DEBUG("%p should not be run anymore",process);
   xbt_swag_remove(process, simix_global->process_list);
-  xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+  if (process->host)
+    xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
   xbt_swag_insert(process, simix_global->process_to_destroy);
   process->context->iwannadie = 0;
 
@@ -122,7 +125,7 @@ void SIMIX_process_empty_trash(void)
   while ((process = (smx_process_t) xbt_swag_extract(simix_global->process_to_destroy))) {
     XBT_DEBUG("Getting rid of %p",process);
 
-    SIMIX_context_free(process->context);
+    delete process->context;
 
     /* Free the exception allocated at creation time */
     free(process->running_ctx);
@@ -132,30 +135,49 @@ void SIMIX_process_empty_trash(void)
 
     xbt_dynar_free(&process->on_exit);
 
-    xbt_free(process->name);
-    xbt_free(process);
+    delete process;
   }
 }
 
-/**
- * \brief Creates and runs the maestro process
- */
-void SIMIX_create_maestro_process()
+namespace simgrid {
+namespace simix {
+
+void create_maestro(std::function<void()> code)
 {
   smx_process_t maestro = NULL;
-
   /* Create maestro process and intilialize it */
-  maestro = xbt_new0(s_smx_process_t, 1);
+  maestro = new simgrid::simix::Process();
   maestro->pid = simix_process_maxpid++;
   maestro->ppid = -1;
-  maestro->name = (char *) "";
+  maestro->name = "";
+  maestro->data = nullptr;
   maestro->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
   XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
-  maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro);
+
+  if (!code) {
+    maestro->context = SIMIX_context_new(std::function<void()>(), NULL, maestro);
+  } else {
+    if (!simix_global)
+      xbt_die("simix is not initialized, please call MSG_init first");
+    maestro->context =
+      simix_global->context_factory->create_maestro(code, maestro);
+  }
+
   maestro->simcall.issuer = maestro;
   simix_global->maestro_process = maestro;
-  return;
 }
+
+}
+}
+
+/**
+ * \brief Creates and runs the maestro process
+ */
+void SIMIX_maestro_create(void (*code)(void*), void* data)
+{
+  simgrid::simix::create_maestro(std::bind(code, data));
+}
+
 /**
  * \brief Stops a process.
  *
@@ -167,58 +189,17 @@ void SIMIX_process_stop(smx_process_t arg) {
   /* execute the on_exit functions */
   SIMIX_process_on_exit_runall(arg);
   /* Add the process to the list of process to restart, only if the host is down */
-  if (arg->auto_restart && arg->host->is_off()) {
-    SIMIX_host_add_auto_restart_process(arg->host,arg->name,arg->code, arg->data,
+  if (arg->auto_restart && arg->host->isOff()) {
+    SIMIX_host_add_auto_restart_process(arg->host, arg->name.c_str(),
+                                        arg->code, arg->data,
                                         sg_host_get_name(arg->host),
                                         SIMIX_timer_get_date(arg->kill_timer),
-                                        arg->argc,arg->argv,arg->properties,
+                                        arg->properties,
                                         arg->auto_restart);
   }
-  XBT_DEBUG("Process %s (%s) is dead",arg->name,sg_host_get_name(arg->host));
-  /* stop the context */
-  SIMIX_context_stop(arg->context);
-}
-
-/**
- * \brief Same as SIMIX_process_create() but with only one argument (used by timers).
- * This function frees the argument.
- * \return the process created
- */
-smx_process_t SIMIX_process_create_from_wrapper(smx_process_arg_t args) {
-
-  smx_process_t process = simix_global->create_process_function(
-                                        args->name,
-                                        args->code,
-                                        args->data,
-                                        args->hostname,
-                                        args->kill_time,
-                                        args->argc,
-                                        args->argv,
-                                        args->properties,
-                                        args->auto_restart,
-                                        NULL);
-  xbt_free(args);
-  return process;
-}
-
-
-void* simcall_HANDLER_process_create(smx_simcall_t simcall,
-                          const char *name,
-                          xbt_main_func_t code,
-                          void *data,
-                          const char *hostname,
-                          double kill_time,
-                          int argc, char **argv,
-                          xbt_dict_t properties,
-                          int auto_restart){
-  return (void*)SIMIX_process_create(name, code, data, hostname,
-                       kill_time, argc, argv, properties, auto_restart,
-                       simcall->issuer);
-}
-
-static void kill_process(void* process)
-{
-  simix_global->kill_process_function((smx_process_t) process);
+  XBT_DEBUG("Process %s (%s) is dead",
+    arg->name.c_str(), sg_host_get_name(arg->host));
+  arg->context->stop();
 }
 
 /**
@@ -232,11 +213,10 @@ static void kill_process(void* process)
  */
 smx_process_t SIMIX_process_create(
                           const char *name,
-                          xbt_main_func_t code,
+                          std::function<void()> code,
                           void *data,
                           const char *hostname,
                           double kill_time,
-                          int argc, char **argv,
                           xbt_dict_t properties,
                           int auto_restart,
                           smx_process_t parent_process)
@@ -246,21 +226,18 @@ smx_process_t SIMIX_process_create(
 
   XBT_DEBUG("Start process %s on host '%s'", name, hostname);
 
-  if (host->is_off()) {
-    int i;
+  if (host->isOff()) {
     XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
           hostname);
-    for (i = 0; i < argc; i++)
-      xbt_free(argv[i]);
-    xbt_free(argv);
+    return nullptr;
   }
   else {
-    process = xbt_new0(s_smx_process_t, 1);
+    process = new simgrid::simix::Process();
 
-    xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
+    xbt_assert(code && host != NULL, "Invalid parameters");
     /* Process data */
     process->pid = simix_process_maxpid++;
-    process->name = xbt_strdup(name);
+    process->name = simgrid::xbt::string(name);
     process->host = host;
     process->data = data;
     process->comms = xbt_fifo_new();
@@ -272,7 +249,7 @@ smx_process_t SIMIX_process_create(
        process->ppid = SIMIX_process_get_PID(parent_process);
        /* SMPI process have their own data segment and
           each other inherit from their father */
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
        if(smpi_privatize_global_variables){
          if( parent_process->pid != 0){
            SIMIX_segment_index_set(process, parent_process->segment_index);
@@ -288,12 +265,11 @@ smx_process_t SIMIX_process_create(
     /* Process data for auto-restart */
     process->auto_restart = auto_restart;
     process->code = code;
-    process->argc = argc;
-    process->argv = argv;
-
 
-    XBT_VERB("Create context %s", process->name);
-    process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process);
+    XBT_VERB("Create context %s", process->name.c_str());
+    process->context = SIMIX_context_new(
+      std::move(code),
+      simix_global->cleanup_process_function, process);
 
     process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
     XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
@@ -308,22 +284,131 @@ smx_process_t SIMIX_process_create(
     /* Add the process to it's host process list */
     xbt_swag_insert(process, sg_host_simix(host)->process_list);
 
-    XBT_DEBUG("Start context '%s'", process->name);
+    XBT_DEBUG("Start context '%s'", process->name.c_str());
 
     /* Now insert it in the global process list and in the process to run list */
     xbt_swag_insert(process, simix_global->process_list);
-    XBT_DEBUG("Inserting %s(%s) in the to_run list", process->name, sg_host_get_name(host));
+    XBT_DEBUG("Inserting %s(%s) in the to_run list",
+      process->name.c_str(), sg_host_get_name(host));
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
 
     if (kill_time > SIMIX_get_clock() && simix_global->kill_process_function) {
-      XBT_DEBUG("Process %s(%s) will be kill at time %f", process->name,
-          sg_host_get_name(process->host), kill_time);
-      process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
+      XBT_DEBUG("Process %s(%s) will be kill at time %f",
+        process->name.c_str(), sg_host_get_name(process->host), kill_time);
+      process->kill_timer = SIMIX_timer_set(kill_time, [=]() {
+        simix_global->kill_process_function(process);
+      });
     }
+
+    /* Tracing the process creation */
+    TRACE_msg_process_create(process->name.c_str(), process->pid, process->host);
   }
   return process;
 }
 
+smx_process_t SIMIX_process_attach(
+  const char* name,
+  void *data,
+  const char* hostname,
+  xbt_dict_t properties,
+  smx_process_t parent_process)
+{
+  // This is mostly a copy/paste from SIMIX_process_new(),
+  // it'd be nice to share some code between those two functions.
+
+  sg_host_t host = sg_host_by_name(hostname);
+  XBT_DEBUG("Attach process %s on host '%s'", name, hostname);
+
+  if (host->isOff()) {
+    XBT_WARN("Cannot launch process '%s' on failed host '%s'",
+      name, hostname);
+    return nullptr;
+  }
+
+  smx_process_t process = new simgrid::simix::Process();
+  /* Process data */
+  process->pid = simix_process_maxpid++;
+  process->name = std::string(name);
+  process->host = host;
+  process->data = data;
+  process->comms = xbt_fifo_new();
+  process->simcall.issuer = process;
+  process->ppid = -1;
+  /* Initiliaze data segment to default value */
+  SIMIX_segment_index_set(process, -1);
+  if (parent_process != NULL) {
+    process->ppid = SIMIX_process_get_PID(parent_process);
+   /* SMPI process have their own data segment and
+      each other inherit from their father */
+  #if HAVE_SMPI
+    if(smpi_privatize_global_variables){
+      if(parent_process->pid != 0){
+        SIMIX_segment_index_set(process, parent_process->segment_index);
+      } else {
+        SIMIX_segment_index_set(process, process->pid - 1);
+      }
+    }
+  #endif
+  }
+
+  /* Process data for auto-restart */
+  process->auto_restart = false;
+  process->code = nullptr;
+
+  XBT_VERB("Create context %s", process->name.c_str());
+  if (!simix_global)
+    xbt_die("simix is not initialized, please call MSG_init first");
+  process->context = simix_global->context_factory->attach(
+    simix_global->cleanup_process_function, process);
+
+  process->running_ctx = (xbt_running_ctx_t*) xbt_malloc0(sizeof(xbt_running_ctx_t));
+  XBT_RUNNING_CTX_INITIALIZE(process->running_ctx);
+
+  if(MC_is_active()){
+    MC_ignore_heap(process->running_ctx, sizeof(*process->running_ctx));
+  }
+
+  /* Add properties */
+  process->properties = properties;
+
+  /* Add the process to it's host process list */
+  xbt_swag_insert(process, sg_host_simix(host)->process_list);
+
+  /* Now insert it in the global process list and in the process to run list */
+  xbt_swag_insert(process, simix_global->process_list);
+  XBT_DEBUG("Inserting %s(%s) in the to_run list",
+    process->name.c_str(), sg_host_get_name(host));
+  xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
+
+  /* Tracing the process creation */
+  TRACE_msg_process_create(process->name.c_str(), process->pid, process->host);
+
+  auto context = dynamic_cast<simgrid::simix::AttachContext*>(process->context);
+  if (!context)
+    xbt_die("Not a suitable context");
+
+  context->attach_start();
+  return process;
+}
+
+void SIMIX_process_detach(void)
+{
+  auto context = dynamic_cast<simgrid::simix::AttachContext*>(SIMIX_context_self());
+  if (!context)
+    xbt_die("Not a suitable context");
+
+  simix_global->cleanup_process_function(context->process());
+
+  // Let maestro ignore we are still alive:
+  // xbt_swag_remove(context->process(), simix_global->process_list);
+
+  // TODDO, Remove from proces list:
+  //   xbt_swag_remove(process, sg_host_simix(host)->process_list);
+
+  context->attach_stop();
+  // delete context;
+}
+
 /**
  * \brief Executes the processes from simix_global->process_to_run.
  *
@@ -357,7 +442,8 @@ void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_process_t process)
  */
 void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
 
-  XBT_DEBUG("Killing process %s on %s", process->name, sg_host_get_name(process->host));
+  XBT_DEBUG("Killing process %s on %s",
+    process->name.c_str(), sg_host_get_name(process->host));
 
   process->context->iwannadie = 1;
   process->blocked = 0;
@@ -367,43 +453,43 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
   /* destroy the blocking synchro if any */
   if (process->waiting_synchro) {
 
-    switch (process->waiting_synchro->type) {
+    simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec*>(process->waiting_synchro);
+    simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
+    simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
+    simgrid::simix::Raw *raw = dynamic_cast<simgrid::simix::Raw*>(process->waiting_synchro);
+    simgrid::simix::Io *io = dynamic_cast<simgrid::simix::Io*>(process->waiting_synchro);
 
-    case SIMIX_SYNC_EXECUTE:
-    case SIMIX_SYNC_PARALLEL_EXECUTE:
-      SIMIX_process_execution_destroy(process->waiting_synchro);
-      break;
+    if (exec != nullptr) {
+      exec->unref();
 
-    case SIMIX_SYNC_COMMUNICATE:
+    } else if (comm != nullptr) {
       xbt_fifo_remove(process->comms, process->waiting_synchro);
-      SIMIX_comm_cancel(process->waiting_synchro);
+      comm->cancel();
       xbt_fifo_remove(process->waiting_synchro->simcalls, &process->simcall);
-      SIMIX_comm_destroy(process->waiting_synchro);
-      break;
+      comm->unref();
 
-    case SIMIX_SYNC_SLEEP:
+    } else if (sleep != nullptr) {
       SIMIX_process_sleep_destroy(process->waiting_synchro);
-      break;
 
-    case SIMIX_SYNC_JOIN:
-      SIMIX_process_sleep_destroy(process->waiting_synchro);
-      break;
-
-    case SIMIX_SYNC_SYNCHRO:
+    } else if (raw != nullptr) {
       SIMIX_synchro_stop_waiting(process, &process->simcall);
-      SIMIX_synchro_destroy(process->waiting_synchro);
-      break;
+      delete process->waiting_synchro;
 
-    case SIMIX_SYNC_IO:
+    } else if (io != nullptr) {
       SIMIX_io_destroy(process->waiting_synchro);
-      break;
-
     }
 
+    /*
+    switch (process->waiting_synchro->type) {
+    case SIMIX_SYNC_JOIN:
+      SIMIX_process_sleep_destroy(process->waiting_synchro);
+      break;
+    } */
+
     process->waiting_synchro = NULL;
   }
   if(!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != issuer) {
-    XBT_DEBUG("Inserting %s in the to_run list", process->name);
+    XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str());
     xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
   }
 
@@ -424,35 +510,34 @@ void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con
   /* cancel the blocking synchro if any */
   if (process->waiting_synchro) {
 
-    switch (process->waiting_synchro->type) {
-
-    case SIMIX_SYNC_EXECUTE:
-    case SIMIX_SYNC_PARALLEL_EXECUTE:
-      SIMIX_process_execution_cancel(process->waiting_synchro);
-      break;
+    simgrid::simix::Exec *exec = dynamic_cast<simgrid::simix::Exec*>(process->waiting_synchro);
+    if (exec != nullptr) {
+      SIMIX_execution_cancel(process->waiting_synchro);
+    }
 
-    case SIMIX_SYNC_COMMUNICATE:
-      xbt_fifo_remove(process->comms, process->waiting_synchro);
-      SIMIX_comm_cancel(process->waiting_synchro);
-      break;
+    simgrid::simix::Comm *comm = dynamic_cast<simgrid::simix::Comm*>(process->waiting_synchro);
+    if (comm != nullptr) {
+      xbt_fifo_remove(process->comms, comm);
+      comm->cancel();
+    }
 
-    case SIMIX_SYNC_SLEEP:
-    case SIMIX_SYNC_JOIN:
+    simgrid::simix::Sleep *sleep = dynamic_cast<simgrid::simix::Sleep*>(process->waiting_synchro);
+    if (sleep != nullptr) {
       SIMIX_process_sleep_destroy(process->waiting_synchro);
       if (!xbt_dynar_member(simix_global->process_to_run, &(process)) && process != SIMIX_process_self()) {
-        XBT_DEBUG("Inserting %s in the to_run list", process->name);
+        XBT_DEBUG("Inserting %s in the to_run list", process->name.c_str());
         xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
       }
-      break;
+    }
 
-    case SIMIX_SYNC_SYNCHRO:
+    simgrid::simix::Raw *raw = dynamic_cast<simgrid::simix::Raw*>(process->waiting_synchro);
+    if (raw != nullptr) {
       SIMIX_synchro_stop_waiting(process, &process->simcall);
-      break;
+    }
 
-    case SIMIX_SYNC_IO:
+    simgrid::simix::Io *io = dynamic_cast<simgrid::simix::Io*>(process->waiting_synchro);
+    if (io != nullptr) {
       SIMIX_io_destroy(process->waiting_synchro);
-      break;
-
     }
   }
   process->waiting_synchro = NULL;
@@ -500,67 +585,38 @@ void SIMIX_process_change_host(smx_process_t process,
 
 void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_process_t process)
 {
-  smx_synchro_t sync_suspend =
-      SIMIX_process_suspend(process, simcall->issuer);
+  smx_synchro_t sync_suspend = SIMIX_process_suspend(process, simcall->issuer);
 
   if (process != simcall->issuer) {
     SIMIX_simcall_answer(simcall);
   } else {
     xbt_fifo_push(sync_suspend->simcalls, simcall);
     process->waiting_synchro = sync_suspend;
-    SIMIX_host_execution_suspend(process->waiting_synchro);
+    process->waiting_synchro->suspend();
   }
   /* If we are suspending ourselves, then just do not finish the simcall now */
 }
 
 smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
 {
-  xbt_assert((process != NULL), "Invalid parameters");
-
   if (process->suspended) {
-    XBT_DEBUG("Process '%s' is already suspended", process->name);
+    XBT_DEBUG("Process '%s' is already suspended", process->name.c_str());
     return NULL;
   }
 
   process->suspended = 1;
 
-  /* If we are suspending another process, and it is waiting on a sync,
-     suspend its synchronization. */
+  /* If we are suspending another process that is waiting on a sync, suspend its synchronization. */
   if (process != issuer) {
 
-    if (process->waiting_synchro) {
-
-      switch (process->waiting_synchro->type) {
+    if (process->waiting_synchro)
+      process->waiting_synchro->suspend();
+    /* If the other process is not waiting, its suspension is delayed to when the process is rescheduled. */
 
-        case SIMIX_SYNC_EXECUTE:
-        case SIMIX_SYNC_PARALLEL_EXECUTE:
-          SIMIX_host_execution_suspend(process->waiting_synchro);
-          break;
-
-        case SIMIX_SYNC_COMMUNICATE:
-          SIMIX_comm_suspend(process->waiting_synchro);
-          break;
-
-        case SIMIX_SYNC_SLEEP:
-          SIMIX_process_sleep_suspend(process->waiting_synchro);
-          break;
-
-        case SIMIX_SYNC_SYNCHRO:
-          /* Suspension is delayed to when the process is rescheduled. */
-          break;
-
-        default:
-          xbt_die("Internal error in SIMIX_process_suspend: unexpected synchronization type %d",
-              (int)process->waiting_synchro->type);
-      }
-      return NULL;
-    } else {
-      /* Suspension is delayed to when the process is rescheduled. */
-      return NULL;
-    }
+    return NULL;
   } else {
     /* FIXME: computation size is zero. Is it okay that bound is zero ? */
-    return SIMIX_process_execute(process, "suspend", 0.0, 1.0, 0.0, 0);
+    return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0, 0);
   }
 }
 
@@ -585,31 +641,7 @@ void SIMIX_process_resume(smx_process_t process, smx_process_t issuer)
   if (process != issuer) {
 
     if (process->waiting_synchro) {
-
-      switch (process->waiting_synchro->type) {
-
-        case SIMIX_SYNC_EXECUTE:
-        case SIMIX_SYNC_PARALLEL_EXECUTE:
-          SIMIX_host_execution_resume(process->waiting_synchro);
-          break;
-
-        case SIMIX_SYNC_COMMUNICATE:
-          SIMIX_comm_resume(process->waiting_synchro);
-          break;
-
-        case SIMIX_SYNC_SLEEP:
-          SIMIX_process_sleep_resume(process->waiting_synchro);
-          break;
-
-        case SIMIX_SYNC_SYNCHRO:
-          /* I cannot resume it now. This is delayed to when the process is rescheduled at
-           * the end of the synchro. */
-          break;
-
-        default:
-          xbt_die("Internal error in SIMIX_process_resume: unexpected synchronization type %d",
-              (int)process->waiting_synchro->type);
-      }
+      process->waiting_synchro->resume();
     }
   } else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
 
@@ -639,9 +671,9 @@ int SIMIX_process_get_PPID(smx_process_t self){
     return self->ppid;
 }
 
-void* SIMIX_process_self_get_data(smx_process_t self)
+void* SIMIX_process_self_get_data()
 {
-  xbt_assert(self == SIMIX_process_self(), "This is not the current process");
+  smx_process_t self = SIMIX_process_self();
 
   if (!self) {
     return NULL;
@@ -649,9 +681,9 @@ void* SIMIX_process_self_get_data(smx_process_t self)
   return SIMIX_process_get_data(self);
 }
 
-void SIMIX_process_self_set_data(smx_process_t self, void *data)
+void SIMIX_process_self_set_data(void *data)
 {
-  xbt_assert(self == SIMIX_process_self(), "This is not the current process");
+  smx_process_t self = SIMIX_process_self();
 
   SIMIX_process_set_data(self, data);
 }
@@ -671,33 +703,27 @@ sg_host_t SIMIX_process_get_host(smx_process_t process)
   return process->host;
 }
 
-xbt_main_func_t SIMIX_process_get_code(void){
-  return SIMIX_process_self()->code;
-}
-
 /* needs to be public and without simcall because it is called
    by exceptions and logging events */
 const char* SIMIX_process_self_get_name(void) {
 
   smx_process_t process = SIMIX_process_self();
   if (process == NULL || process == simix_global->maestro_process)
-    return "";
+    return "maestro";
 
   return SIMIX_process_get_name(process);
 }
 
 const char* SIMIX_process_get_name(smx_process_t process)
 {
-  return process->name;
+  return process->name.c_str();
 }
 
 smx_process_t SIMIX_process_get_by_name(const char* name)
 {
   smx_process_t proc;
-
-  xbt_swag_foreach(proc, simix_global->process_list)
-  {
-    if(!strcmp(name, proc->name))
+  xbt_swag_foreach(proc, simix_global->process_list) {
+    if (proc->name == name)
       return proc;
   }
   return NULL;
@@ -720,12 +746,14 @@ void simcall_HANDLER_process_join(smx_simcall_t simcall, smx_process_t process,
   simcall->issuer->waiting_synchro = sync;
 }
 
-static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t sync){
-  if (sync->sleep.surf_sleep) {
-    sync->sleep.surf_sleep->cancel();
+static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synchro_t synchro){
+  simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
+
+  if (sleep->surf_sleep) {
+    sleep->surf_sleep->cancel();
 
     smx_simcall_t simcall;
-    while ((simcall = (smx_simcall_t) xbt_fifo_shift(sync->simcalls))) {
+    while ((simcall = (smx_simcall_t) xbt_fifo_shift(sleep->simcalls))) {
       simcall_process_sleep__set__result(simcall, SIMIX_DONE);
       simcall->issuer->waiting_synchro = NULL;
       if (simcall->issuer->suspended) {
@@ -736,17 +764,16 @@ static int SIMIX_process_join_finish(smx_process_exit_status_t status, smx_synch
         SIMIX_simcall_answer(simcall);
       }
     }
-    sync->sleep.surf_sleep->unref();
-    sync->sleep.surf_sleep = NULL;
+    sleep->surf_sleep->unref();
+    sleep->surf_sleep = NULL;
   }
-  xbt_mallocator_release(simix_global->synchro_mallocator, sync);
+  delete sleep;
   return 0;
 }
 
 smx_synchro_t SIMIX_process_join(smx_process_t issuer, smx_process_t process, double timeout)
 {
   smx_synchro_t res = SIMIX_process_sleep(issuer, timeout);
-  res->type = SIMIX_SYNC_JOIN;
   SIMIX_process_on_exit(process, (int_f_pvoid_pvoid_t)SIMIX_process_join_finish, res);
   return res;
 }
@@ -769,89 +796,29 @@ smx_synchro_t SIMIX_process_sleep(smx_process_t process, double duration)
   sg_host_t host = process->host;
 
   /* check if the host is active */
-  if (host->is_off()) {
-    THROWF(host_error, 0, "Host %s failed, you cannot call this function",
-           sg_host_get_name(host));
-  }
+  if (host->isOff())
+    THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
 
-  smx_synchro_t synchro = (smx_synchro_t) xbt_mallocator_get(simix_global->synchro_mallocator);
-  synchro->type = SIMIX_SYNC_SLEEP;
+  simgrid::simix::Sleep *synchro = new simgrid::simix::Sleep();
   synchro->name = NULL;
-  synchro->category = NULL;
-
-  synchro->sleep.host = host;
-  synchro->sleep.surf_sleep = surf_host_sleep(host, duration);
 
-  synchro->sleep.surf_sleep->setData(synchro);
+  synchro->host = host;
+  synchro->surf_sleep = surf_host_sleep(host, duration);
+  synchro->surf_sleep->setData(synchro);
   XBT_DEBUG("Create sleep synchronization %p", synchro);
 
   return synchro;
 }
 
-void SIMIX_post_process_sleep(smx_synchro_t synchro)
-{
-  smx_simcall_t simcall;
-  e_smx_state_t state;
-  xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
-
-  while ((simcall = (smx_simcall_t) xbt_fifo_shift(synchro->simcalls))) {
-
-    switch (synchro->sleep.surf_sleep->getState()){
-      case SURF_ACTION_FAILED:
-        simcall->issuer->context->iwannadie = 1;
-        //SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
-        state = SIMIX_SRC_HOST_FAILURE;
-        break;
-
-      case SURF_ACTION_DONE:
-        state = SIMIX_DONE;
-        break;
-
-      default:
-        THROW_IMPOSSIBLE;
-        break;
-    }
-    if (simcall->issuer->host->is_off()) {
-      simcall->issuer->context->iwannadie = 1;
-    }
-    simcall_process_sleep__set__result(simcall, state);
-    simcall->issuer->waiting_synchro = NULL;
-    if (simcall->issuer->suspended) {
-      XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
-      simcall->issuer->suspended = 0;
-      simcall_HANDLER_process_suspend(simcall, simcall->issuer);
-    } else {
-      SIMIX_simcall_answer(simcall);
-    }
-  }
-
-  SIMIX_process_sleep_destroy(synchro);
-}
-
 void SIMIX_process_sleep_destroy(smx_synchro_t synchro)
 {
   XBT_DEBUG("Destroy synchro %p", synchro);
-  xbt_assert(synchro->type == SIMIX_SYNC_SLEEP || synchro->type == SIMIX_SYNC_JOIN);
+  simgrid::simix::Sleep *sleep = static_cast<simgrid::simix::Sleep*>(synchro);
 
-  if (synchro->sleep.surf_sleep) {
-    synchro->sleep.surf_sleep->unref();
-    synchro->sleep.surf_sleep = NULL;
+  if (sleep->surf_sleep) {
+    sleep->surf_sleep->unref();
+    sleep->surf_sleep = NULL;
   }
-  if (synchro->type == SIMIX_SYNC_SLEEP)
-    xbt_mallocator_release(simix_global->synchro_mallocator, synchro);
-}
-
-void SIMIX_process_sleep_suspend(smx_synchro_t synchro)
-{
-  xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
-  synchro->sleep.surf_sleep->suspend();
-}
-
-void SIMIX_process_sleep_resume(smx_synchro_t synchro)
-{
-  XBT_DEBUG("Synchro state is %d on process_sleep_resume.", synchro->state);
-  xbt_assert(synchro->type == SIMIX_SYNC_SLEEP);
-  synchro->sleep.surf_sleep->resume();
 }
 
 /**
@@ -864,13 +831,13 @@ void SIMIX_process_sleep_resume(smx_synchro_t synchro)
  */
 void SIMIX_process_yield(smx_process_t self)
 {
-  XBT_DEBUG("Yield process '%s'", self->name);
+  XBT_DEBUG("Yield process '%s'", self->name.c_str());
 
   /* Go into sleep and return control to maestro */
-  SIMIX_context_suspend(self->context);
+  self->context->suspend();
 
   /* Ok, maestro returned control to us */
-  XBT_DEBUG("Control returned to me: '%s'", self->name);
+  XBT_DEBUG("Control returned to me: '%s'", self->name.c_str());
 
   if (self->new_host) {
     SIMIX_process_change_host(self, self->new_host);
@@ -892,7 +859,7 @@ void SIMIX_process_yield(smx_process_t self)
   if (self->doexception) {
     XBT_DEBUG("Wait, maestro left me an exception");
     self->doexception = 0;
-    SMX_THROW();
+    RETHROW;
   }
 
   if(SMPI_switch_data_segment && self->segment_index != -1){
@@ -903,7 +870,11 @@ void SIMIX_process_yield(smx_process_t self)
 /* callback: context fetching */
 xbt_running_ctx_t *SIMIX_process_get_running_context(void)
 {
-  return SIMIX_process_self()->running_ctx;
+  smx_process_t process = SIMIX_process_self();
+  if (process)
+    return process->running_ctx;
+  else
+    return nullptr;
 }
 
 /* callback: termination */
@@ -989,55 +960,53 @@ smx_process_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_process
 }
 /** @brief Restart a process, starting it again from the beginning. */
 smx_process_t SIMIX_process_restart(smx_process_t process, smx_process_t issuer) {
-  XBT_DEBUG("Restarting process %s on %s", process->name, sg_host_get_name(process->host));
+  XBT_DEBUG("Restarting process %s on %s",
+    process->name.c_str(), sg_host_get_name(process->host));
+
   //retrieve the arguments of the old process
   //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
-  s_smx_process_arg_t arg;
+  simgrid::simix::ProcessArg arg;
+  arg.name = process->name;
   arg.code = process->code;
   arg.hostname = sg_host_get_name(process->host);
   arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
-  arg.argc = process->argc;
   arg.data = process->data;
-  int i;
-  arg.argv = xbt_new(char*,process->argc + 1);
-  for (i = 0; i < arg.argc; i++) {
-    arg.argv[i] = xbt_strdup(process->argv[i]);
-  }
-  arg.argv[process->argc] = NULL;
   arg.properties = NULL;
   arg.auto_restart = process->auto_restart;
+
   //kill the old process
-  SIMIX_process_kill(process,issuer);
-  //start the new process
-  smx_process_t new_process;
-  if (simix_global->create_process_function) {
-    new_process = simix_global->create_process_function(
-                                          arg.argv[0],
-                                          arg.code,
-                                          arg.data,
-                                          arg.hostname,
-                                          arg.kill_time,
-                                          arg.argc,
-                                          arg.argv,
-                                          arg.properties,
-                                          arg.auto_restart,
-                                          NULL);
-  } else {
-    new_process = simcall_process_create(
-                           arg.argv[0],
-                           arg.code,
-                           arg.data,
-                           arg.hostname,
-                           arg.kill_time,
-                           arg.argc,
-                           arg.argv,
-                           arg.properties,
-                           arg.auto_restart);
+  SIMIX_process_kill(process, issuer);
 
-  }
-  return new_process;
+  //start the new process
+  if (simix_global->create_process_function)
+    return simix_global->create_process_function(
+      arg.name.c_str(), std::move(arg.code), arg.data,
+      arg.hostname, arg.kill_time,
+      arg.properties, arg.auto_restart,
+      nullptr);
+  else
+    return simcall_process_create(
+      arg.name.c_str(), std::move(arg.code), arg.data,
+      arg.hostname, arg.kill_time,
+      arg.properties, arg.auto_restart);
 }
 
 void SIMIX_segment_index_set(smx_process_t proc, int index){
   proc->segment_index = index;
 }
+
+smx_process_t simcall_process_create(
+  const char *name, std::function<void()> code, void *data,
+  const char *hostname, double kill_time,
+  xbt_dict_t properties, int auto_restart)
+{
+  if (name == nullptr)
+    name = "";
+  smx_process_t self = SIMIX_process_self();
+  return simgrid::simix::kernel([&] {
+    return SIMIX_process_create(name,
+          std::move(code), data, hostname,
+          kill_time, properties, auto_restart,
+          self);
+  });
+}
\ No newline at end of file