start to untangle the MSG actor creation mess

[simgrid.git] / src / simix / ActorImpl.cpp

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 9715c65..8fdad95 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -135,7 +135,7 @@ void SIMIX_process_cleanup(smx_actor_t process)
   XBT_DEBUG("%p should not be run anymore",process);
   simix_global->process_list.erase(process->pid);
   if (process->host)
   XBT_DEBUG("%p should not be run anymore",process);
   simix_global->process_list.erase(process->pid);
   if (process->host)

-    xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+    xbt_swag_remove(process, process->host->extension<simgrid::simix::Host>()->process_list);

   xbt_swag_insert(process, simix_global->process_to_destroy);
   process->context->iwannadie = 0;
 
   xbt_swag_insert(process, simix_global->process_to_destroy);
   process->context->iwannadie = 0;
 


@@ -218,7 +218,6 @@ smx_actor_t SIMIX_process_create(
                           std::function<void()> code,
                           void *data,
                           sg_host_t host,
                           std::function<void()> code,
                           void *data,
                           sg_host_t host,

-                          double kill_time,

                           xbt_dict_t properties,
                           int auto_restart,
                           smx_actor_t parent_process)
                           xbt_dict_t properties,
                           int auto_restart,
                           smx_actor_t parent_process)


@@ -274,7 +273,7 @@ smx_actor_t SIMIX_process_create(
     process->properties = properties;
 
     /* Add the process to it's host process list */
     process->properties = properties;
 
     /* Add the process to it's host process list */

-    xbt_swag_insert(process, sg_host_simix(host)->process_list);
+    xbt_swag_insert(process, host->extension<simgrid::simix::Host>()->process_list);

 
     XBT_DEBUG("Start context '%s'", process->name.c_str());
 
 
     XBT_DEBUG("Start context '%s'", process->name.c_str());
 


@@ -283,13 +282,6 @@ smx_actor_t SIMIX_process_create(
     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);
 
     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->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->cname(), process->pid, process->host);
   }
     /* Tracing the process creation */
     TRACE_msg_process_create(process->cname(), process->pid, process->host);
   }


@@ -354,7 +346,7 @@ smx_actor_t SIMIX_process_attach(
   process->properties = properties;
 
   /* Add the process to it's host process list */
   process->properties = properties;
 
   /* Add the process to it's host process list */

-  xbt_swag_insert(process, sg_host_simix(host)->process_list);
+  xbt_swag_insert(process, host->extension<simgrid::simix::Host>()->process_list);

 
   /* Now insert it in the global process list and in the process to run list */
   simix_global->process_list[process->pid] = process;
 
   /* Now insert it in the global process list and in the process to run list */
   simix_global->process_list[process->pid] = process;


@@ -559,9 +551,9 @@ void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_actor_t process
 void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
 {
   xbt_assert((process != nullptr), "Invalid parameters");
 void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest)
 {
   xbt_assert((process != nullptr), "Invalid parameters");

-  xbt_swag_remove(process, sg_host_simix(process->host)->process_list);
+  xbt_swag_remove(process, process->host->extension<simgrid::simix::Host>()->process_list);

   process->host = dest;
   process->host = dest;

-  xbt_swag_insert(process, sg_host_simix(dest)->process_list);
+  xbt_swag_insert(process, dest->extension<simgrid::simix::Host>()->process_list);

 }
 
 
 }
 
 


@@ -644,7 +636,7 @@ void* SIMIX_process_self_get_data()
   if (!self) {
     return nullptr;
   }
   if (!self) {
     return nullptr;
   }

-  return SIMIX_process_get_data(self);
+  return self->data;

 }
 
 void SIMIX_process_self_set_data(void *data)
 }
 
 void SIMIX_process_self_set_data(void *data)


@@ -654,11 +646,6 @@ void SIMIX_process_self_set_data(void *data)
   SIMIX_process_set_data(self, data);
 }
 
   SIMIX_process_set_data(self, data);
 }
 

-void* SIMIX_process_get_data(smx_actor_t process)
-{
-  return process->data;
-}
-

 void SIMIX_process_set_data(smx_actor_t process, void *data)
 {
   process->data = data;
 void SIMIX_process_set_data(smx_actor_t process, void *data)
 {
   process->data = data;


@@ -791,7 +778,7 @@ void SIMIX_process_sleep_destroy(smx_activity_t synchro)
  */
 void SIMIX_process_yield(smx_actor_t self)
 {
  */
 void SIMIX_process_yield(smx_actor_t self)
 {

-  XBT_DEBUG("Yield process '%s'", self->name.c_str());
+  XBT_DEBUG("Yield actor '%s'", self->cname());

 
   /* Go into sleep and return control to maestro */
   self->context->suspend();
 
   /* Go into sleep and return control to maestro */
   self->context->suspend();


@@ -935,8 +922,12 @@ smx_actor_t SIMIX_process_restart(smx_actor_t process, smx_actor_t issuer) {
   SIMIX_process_kill(process, issuer);
 
   //start the new process
   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.host,
-      arg.kill_time, arg.properties, arg.auto_restart, nullptr);
+  smx_actor_t actor = simix_global->create_process_function(arg.name.c_str(), std::move(arg.code), arg.data, arg.host,
+                                                            arg.properties, arg.auto_restart, nullptr);
+  if (arg.kill_time >= 0)
+    simcall_process_set_kill_time(actor, arg.kill_time);
+
+  return actor;

 }
 
 void SIMIX_segment_index_set(smx_actor_t proc, int index){
 }
 
 void SIMIX_segment_index_set(smx_actor_t proc, int index){


@@ -964,7 +955,6 @@ smx_actor_t simcall_process_create(const char *name,
                               xbt_main_func_t code,
                               void *data,
                               sg_host_t host,
                               xbt_main_func_t code,
                               void *data,
                               sg_host_t host,

-                              double kill_time,

                               int argc, char **argv,
                               xbt_dict_t properties,
                               int auto_restart)
                               int argc, char **argv,
                               xbt_dict_t properties,
                               int auto_restart)


@@ -975,21 +965,17 @@ smx_actor_t simcall_process_create(const char *name,
   for (int i = 0; i != argc; ++i)
     xbt_free(argv[i]);
   xbt_free(argv);
   for (int i = 0; i != argc; ++i)
     xbt_free(argv[i]);
   xbt_free(argv);

-  smx_actor_t res = simcall_process_create(name,
-    std::move(wrapped_code),
-    data, host, kill_time, properties, auto_restart);
+  smx_actor_t res = simcall_process_create(name, std::move(wrapped_code), data, host, properties, auto_restart);

   return res;
 }
 
   return res;
 }
 

-smx_actor_t simcall_process_create(
-  const char *name, std::function<void()> code, void *data,
-  sg_host_t host, double kill_time,
-  xbt_dict_t properties, int auto_restart)
+smx_actor_t simcall_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
+                                   xbt_dict_t properties, int auto_restart)

 {
   if (name == nullptr)
     name = "";
   smx_actor_t self = SIMIX_process_self();
 {
   if (name == nullptr)
     name = "";
   smx_actor_t self = SIMIX_process_self();

-  return simgrid::simix::kernelImmediate([&] {
-    return SIMIX_process_create(name, std::move(code), data, host, kill_time, properties, auto_restart, self);
+  return simgrid::simix::kernelImmediate([name, code, data, host, properties, auto_restart, self] {
+    return SIMIX_process_create(name, std::move(code), data, host, properties, auto_restart, self);

   });
 }
   });
 }