X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/665b37c47175d0abd08d1252180d4d37bf9a342a..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/simix/ActorImpl.cpp

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index d283b1e794..346c51b7c1 100644
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -218,13 +218,11 @@ void SIMIX_process_stop(smx_actor_t arg) {
   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->properties,
                                         arg->auto_restart);
   }
-  XBT_DEBUG("Process %s (%s) is dead",
-    arg->name.c_str(), sg_host_get_name(arg->host));
+  XBT_DEBUG("Process %s@%s is dead", arg->cname(), arg->host->cname());
   arg->context->stop();
 }
 
@@ -241,20 +239,18 @@ smx_actor_t SIMIX_process_create(
                           const char *name,
                           std::function<void()> code,
                           void *data,
-                          const char *hostname,
+                          sg_host_t host,
                           double kill_time,
                           xbt_dict_t properties,
                           int auto_restart,
                           smx_actor_t parent_process)
 {
   smx_actor_t process = nullptr;
-  sg_host_t host = sg_host_by_name(hostname);
 
-  XBT_DEBUG("Start process %s on host '%s'", name, hostname);
+  XBT_DEBUG("Start process %s on host '%s'", name, host->cname());
 
   if (host->isOff()) {
-    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name,
-          hostname);
+    XBT_WARN("Cannot launch process '%s' on failed host '%s'", name, host->cname());
     return nullptr;
   }
   else {
@@ -306,20 +302,18 @@ smx_actor_t SIMIX_process_create(
 
     /* 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_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);
 
     if (kill_time > SIMIX_get_clock() && simix_global->kill_process_function) {
-      XBT_DEBUG("Process %s(%s) will be kill at time %f",
-        process->name.c_str(), sg_host_get_name(process->host), kill_time);
+      XBT_DEBUG("Process %s(%s) will be kill at time %f", process->cname(), process->host->cname(), 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);
+    TRACE_msg_process_create(process->cname(), process->pid, process->host);
   }
   return process;
 }
@@ -386,12 +380,11 @@ smx_actor_t SIMIX_process_attach(
 
   /* 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_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);
 
   /* Tracing the process creation */
-  TRACE_msg_process_create(process->name.c_str(), process->pid, process->host);
+  TRACE_msg_process_create(process->cname(), process->pid, process->host);
 
   auto context = dynamic_cast<simgrid::kernel::context::AttachContext*>(process->context);
   if (!context)
@@ -452,8 +445,7 @@ void simcall_HANDLER_process_kill(smx_simcall_t simcall, smx_actor_t process) {
  */
 void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
 
-  XBT_DEBUG("Killing process %s on %s",
-    process->name.c_str(), sg_host_get_name(process->host));
+  XBT_DEBUG("Killing process %s@%s", process->cname(), process->host->cname());
 
   process->context->iwannadie = 1;
   process->blocked = 0;
@@ -521,7 +513,7 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const
   SMX_EXCEPTION(process, cat, value, msg);
 
   if (process->suspended)
-    SIMIX_process_resume(process,SIMIX_process_self());
+    SIMIX_process_resume(process);
 
   /* cancel the blocking synchro if any */
   if (process->waiting_synchro) {
@@ -630,18 +622,13 @@ smx_activity_t SIMIX_process_suspend(smx_actor_t process, smx_actor_t issuer)
 
     return nullptr;
   } else {
-    /* FIXME: computation size is zero. Is it okay that bound is zero ? */
     return SIMIX_execution_start(process, "suspend", 0.0, 1.0, 0.0);
   }
 }
 
-void simcall_HANDLER_process_resume(smx_simcall_t simcall, smx_actor_t process){
-  SIMIX_process_resume(process, simcall->issuer);
-}
-
-void SIMIX_process_resume(smx_actor_t process, smx_actor_t issuer)
+void SIMIX_process_resume(smx_actor_t process)
 {
-  XBT_IN("process = %p, issuer = %p", process, issuer);
+  XBT_IN("process = %p", process);
 
   if(process->context->iwannadie) {
     XBT_VERB("Ignoring request to suspend a process that is currently dying.");
@@ -651,14 +638,9 @@ void SIMIX_process_resume(smx_actor_t process, smx_actor_t issuer)
   if(!process->suspended) return;
   process->suspended = 0;
 
-  /* If we are resuming another process, resume the synchronization it was waiting for
-     if any. Otherwise add it to the list of process to run in the next round. */
-  if (process != issuer) {
-
-    if (process->waiting_synchro) {
-      process->waiting_synchro->resume();
-    }
-  } else XBT_WARN("Strange. Process %p is trying to resume himself.", issuer);
+  /* resume the synchronization that was blocking the resumed process. */
+  if (process->waiting_synchro)
+    process->waiting_synchro->resume();
 
   XBT_OUT();
 }
@@ -802,9 +784,8 @@ smx_activity_t SIMIX_process_sleep(smx_actor_t process, double duration)
 {
   sg_host_t host = process->host;
 
-  /* check if the host is active */
   if (host->isOff())
-    THROWF(host_error, 0, "Host %s failed, you cannot call this function", sg_host_get_name(host));
+    THROWF(host_error, 0, "Host %s failed, you cannot sleep there.", host->cname());
 
   simgrid::kernel::activity::Sleep *synchro = new simgrid::kernel::activity::Sleep();
   synchro->host = host;
@@ -955,14 +936,14 @@ smx_actor_t simcall_HANDLER_process_restart(smx_simcall_t simcall, smx_actor_t p
 }
 /** @brief Restart a process, starting it again from the beginning. */
 smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) {
-  XBT_DEBUG("Restarting process %s on %s", process->name.c_str(), sg_host_get_name(process->host));
+  XBT_DEBUG("Restarting process %s on %s", process->cname(), process->host->cname());
 
   //retrieve the arguments of the old process
   //FIXME: Factorize this with SIMIX_host_add_auto_restart_process ?
   simgrid::simix::ProcessArg arg;
   arg.name = process->name;
   arg.code = process->code;
-  arg.hostname = sg_host_get_name(process->host);
+  arg.host = process->host;
   arg.kill_time = SIMIX_timer_get_date(process->kill_timer);
   arg.data = process->data;
   arg.properties = nullptr;
@@ -972,7 +953,7 @@ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) {
   SIMIX_process_kill(process, issuer);
 
   //start the new process
-  return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.hostname,
+  return simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host,
       arg.kill_time, arg.properties, arg.auto_restart, nullptr);
 }
 
@@ -1000,7 +981,7 @@ void SIMIX_segment_index_set(smx_actor_t proc, int index){
 smx_actor_t simcall_process_create(const char *name,
                               xbt_main_func_t code,
                               void *data,
-                              const char *hostname,
+                              sg_host_t host,
                               double kill_time,
                               int argc, char **argv,
                               xbt_dict_t properties,
@@ -1014,19 +995,19 @@ smx_actor_t simcall_process_create(const char *name,
   xbt_free(argv);
   smx_actor_t res = simcall_process_create(name,
     std::move(wrapped_code),
-    data, hostname, kill_time, properties, auto_restart);
+    data, host, kill_time, properties, auto_restart);
   return res;
 }
 
 smx_actor_t simcall_process_create(
   const char *name, std::function<void()> code, void *data,
-  const char *hostname, double kill_time,
+  sg_host_t host, double kill_time,
   xbt_dict_t properties, int auto_restart)
 {
   if (name == nullptr)
     name = "";
   smx_actor_t self = SIMIX_process_self();
   return simgrid::simix::kernelImmediate([&] {
-    return SIMIX_process_create(name, std::move(code), data, hostname, kill_time, properties, auto_restart, self);
+    return SIMIX_process_create(name, std::move(code), data, host, kill_time, properties, auto_restart, self);
   });
 }