[simix] Rename s_smx_process_arg to simgrid::simix::ProcessArg

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

diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp
index 32b5c8cd60ec338e8a173f8ead3671682a07fe8e..0effb83035a9cbafae613b1c9f4ed202746eef40 100644 (file)
--- a/src/simix/smx_process.cpp
+++ b/src/simix/smx_process.cpp
@@ -136,7 +136,7 @@ void SIMIX_process_empty_trash(void)
     xbt_dynar_free(&process->on_exit);
 
     xbt_free(process->name);
-    xbt_free(process);
+    delete process;
   }
 }
 
@@ -147,7 +147,7 @@ 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*) "";
@@ -156,7 +156,7 @@ void create_maestro(std::function<void()> code)
   XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
 
   if (!code) {
-    maestro->context = SIMIX_context_new(NULL, 0, nullptr, NULL, maestro);
+    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");
@@ -201,29 +201,6 @@ void SIMIX_process_stop(smx_process_t arg) {
   arg->context->stop();
 }
 
-/**
- * \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,
@@ -277,7 +254,7 @@ smx_process_t SIMIX_process_create(
     xbt_free(argv);
   }
   else {
-    process = xbt_new0(s_smx_process_t, 1);
+    process = new simgrid::simix::Process();
 
     xbt_assert(((code != NULL) && (host != NULL)), "Invalid parameters");
     /* Process data */
@@ -315,7 +292,9 @@ smx_process_t SIMIX_process_create(
 
 
     XBT_VERB("Create context %s", process->name);
-    process->context = SIMIX_context_new(code, argc, argv, simix_global->cleanup_process_function, process);
+    process->context = SIMIX_context_new(
+      simgrid::simix::wrap_main(code, argc, argv),
+      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);
@@ -368,7 +347,7 @@ smx_process_t SIMIX_process_attach(
     return nullptr;
   }
 
-  smx_process_t process = xbt_new0(s_smx_process_t, 1);
+  smx_process_t process = new simgrid::simix::Process();
   /* Process data */
   process->pid = simix_process_maxpid++;
   process->name = xbt_strdup(name);
@@ -516,7 +495,7 @@ void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
 
     } else if (raw != nullptr) {
       SIMIX_synchro_stop_waiting(process, &process->simcall);
-      SIMIX_synchro_destroy(process->waiting_synchro);
+      delete process->waiting_synchro;
 
     } else if (io != nullptr) {
       SIMIX_io_destroy(process->waiting_synchro);
@@ -628,15 +607,14 @@ 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_execution_suspend(process->waiting_synchro);
+    process->waiting_synchro->suspend();
   }
   /* If we are suspending ourselves, then just do not finish the simcall now */
 }
@@ -1013,7 +991,7 @@ 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));
   //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.code = process->code;
   arg.hostname = sg_host_get_name(process->host);
   arg.kill_time = SIMIX_timer_get_date(process->kill_timer);