[simix] Remove simcall_HANDLER_process_create() as well

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

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 72651d2..7243535 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -202,26 +202,6 @@ void SIMIX_process_stop(smx_process_t arg) {
   arg->context->stop();
 }
 
-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)
-{
-  void* res = SIMIX_process_create(
-    name, simgrid::simix::wrap_main(code, argc, argv), data, hostname,
-    kill_time, properties, auto_restart, simcall->issuer);
-  for (int i = 0; i != argc; ++i)
-    xbt_free(argv[i]);
-  xbt_free(argv);
-  return res;
-}
-
-static void kill_process(void* process)
-{
-  simix_global->kill_process_function((smx_process_t) process);
-}
-
 /**
  * \brief Internal function to create a process.
  *
@@ -257,7 +237,7 @@ smx_process_t SIMIX_process_create(
     xbt_assert(code && host != NULL, "Invalid parameters");
     /* Process data */
     process->pid = simix_process_maxpid++;
-    process->name = std::string(name);
+    process->name = simgrid::xbt::string(name);
     process->host = host;
     process->data = data;
     process->comms = xbt_fifo_new();
@@ -315,7 +295,9 @@ smx_process_t SIMIX_process_create(
     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);
-      process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
+      process->kill_timer = SIMIX_timer_set(kill_time, [=]() {
+        simix_global->kill_process_function(process);
+      });
     }
 
     /* Tracing the process creation */