X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/90d012e147a92dd7c78f0d0e8d1614b6559eb450..5e1b4fa835cedc144a2ebe97fda0d139d63d3058:/src/simix/ActorImpl.cpp

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index be85cd753c..9715c65360 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -25,8 +25,8 @@
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/kernel/activity/SynchroRaw.hpp"
 #include "src/kernel/activity/SynchroSleep.hpp"
-#include "src/mc/Client.hpp"
 #include "src/mc/mc_replay.h"
+#include "src/mc/remote/Client.hpp"
 #include "src/msg/msg_private.h"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/surf_interface.hpp"
@@ -133,7 +133,7 @@ void SIMIX_process_cleanup(smx_actor_t process)
   }
 
   XBT_DEBUG("%p should not be run anymore",process);
-  xbt_swag_remove(process, simix_global->process_list);
+  simix_global->process_list.erase(process->pid);
   if (process->host)
     xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
   xbt_swag_insert(process, simix_global->process_to_destroy);
@@ -175,7 +175,7 @@ ActorImpl::~ActorImpl()
 void create_maestro(std::function<void()> code)
 {
   smx_actor_t maestro = nullptr;
-  /* Create maestro process and intilialize it */
+  /* Create maestro process and initialize it */
   maestro = new simgrid::simix::ActorImpl();
   maestro->pid = simix_process_maxpid++;
   maestro->ppid = -1;
@@ -204,29 +204,6 @@ void SIMIX_maestro_create(void (*code)(void*), void* data)
   simgrid::simix::create_maestro(std::bind(code, data));
 }
 
-/**
- * \brief Stops a process.
- *
- * Stops the process, execute all the registered on_exit functions,
- * register it to the list of the process to restart if needed
- * and stops its context.
- */
-void SIMIX_process_stop(smx_actor_t arg) {
-  arg->finished = true;
-  /* 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->isOff()) {
-    SIMIX_host_add_auto_restart_process(arg->host, arg->name.c_str(),
-                                        arg->code, arg->data,
-                                        SIMIX_timer_get_date(arg->kill_timer),
-                                        arg->properties,
-                                        arg->auto_restart);
-  }
-  XBT_DEBUG("Process %s@%s is dead", arg->cname(), arg->host->cname());
-  arg->context->stop();
-}
-
 /**
  * \brief Internal function to create a process.
  *
@@ -302,7 +279,7 @@ smx_actor_t SIMIX_process_create(
     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);
+    simix_global->process_list[process->pid] = process;
     XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname());
     xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process);
 
@@ -380,7 +357,7 @@ smx_actor_t SIMIX_process_attach(
   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);
+  simix_global->process_list[process->pid] = process;
   XBT_DEBUG("Inserting %s(%s) in the to_run list", process->cname(), host->cname());
   xbt_dynar_push_as(simix_global->process_to_run, smx_actor_t, process);
 
@@ -506,6 +483,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
 
 /** @brief Ask another process to raise the given exception
  *
+ * @param process The process that should raise that exception
  * @param cat category of exception
  * @param value value associated to the exception
  * @param msg string information associated to the exception
@@ -562,13 +540,9 @@ void simcall_HANDLER_process_killall(smx_simcall_t simcall, int reset_pid) {
  */
 void SIMIX_process_killall(smx_actor_t issuer, int reset_pid)
 {
-  smx_actor_t p = nullptr;
-
-  while ((p = (smx_actor_t) xbt_swag_extract(simix_global->process_list))) {
-    if (p != issuer) {
-      SIMIX_process_kill(p,issuer);
-    }
-  }
+  for (auto kv : simix_global->process_list)
+    if (kv.second != issuer)
+      SIMIX_process_kill(kv.second, issuer);
 
   if (reset_pid > 0)
     simix_process_maxpid = reset_pid;
@@ -652,7 +626,7 @@ int SIMIX_process_get_maxpid() {
 
 int SIMIX_process_count()
 {
-  return xbt_swag_size(simix_global->process_list);
+  return simix_global->process_list.size();
 }
 
 int SIMIX_process_get_PID(smx_actor_t self)
@@ -703,11 +677,9 @@ const char* SIMIX_process_self_get_name() {
 
 smx_actor_t SIMIX_process_get_by_name(const char* name)
 {
-  smx_actor_t proc;
-  xbt_swag_foreach(proc, simix_global->process_list) {
-    if (proc->name == name)
-      return proc;
-  }
+  for (auto kv : simix_global->process_list)
+    if (kv.second->name == name)
+      return kv.second;
   return nullptr;
 }
 
@@ -834,7 +806,19 @@ void SIMIX_process_yield(smx_actor_t self)
 
   if (self->context->iwannadie){
     XBT_DEBUG("I wanna die!");
-    SIMIX_process_stop(self);
+    self->finished = true;
+    /* execute the on_exit functions */
+    SIMIX_process_on_exit_runall(self);
+    /* Add the process to the list of process to restart, only if the host is down */
+    if (self->auto_restart && self->host->isOff()) {
+      SIMIX_host_add_auto_restart_process(self->host, self->cname(),
+                                          self->code, self->data,
+                                          SIMIX_timer_get_date(self->kill_timer),
+                                          self->properties,
+                                          self->auto_restart);
+    }
+    XBT_DEBUG("Process %s@%s is dead", self->cname(), self->host->cname());
+    self->context->stop();
   }
 
   if (self->suspended) {
@@ -884,19 +868,16 @@ xbt_dynar_t SIMIX_process_get_runnable()
  */
 smx_actor_t SIMIX_process_from_PID(int PID)
 {
-  smx_actor_t proc;
-  xbt_swag_foreach(proc, simix_global->process_list) {
-   if (proc->pid == static_cast<unsigned long> (PID))
-    return proc;
-  }
-  return nullptr;
+  if (simix_global->process_list.find(PID) == simix_global->process_list.end())
+    return nullptr;
+  return simix_global->process_list.at(PID);
 }
 
 /** @brief returns a dynar containing all currently existing processes */
 xbt_dynar_t SIMIX_processes_as_dynar() {
-  smx_actor_t proc;
   xbt_dynar_t res = xbt_dynar_new(sizeof(smx_actor_t),nullptr);
-  xbt_swag_foreach(proc, simix_global->process_list) {
+  for (auto kv : simix_global->process_list) {
+    smx_actor_t proc = kv.second;
     xbt_dynar_push(res,&proc);
   }
   return res;
@@ -972,7 +953,7 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){
  * \param code the main function of the process
  * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be nullptr.
  * It can be retrieved with the function \ref simcall_process_get_data.
- * \param hostname name of the host where the new agent is executed.
+ * \param host where the new agent is executed.
  * \param kill_time time when the process is killed
  * \param argc first argument passed to \a code
  * \param argv second argument passed to \a code