[simix] C++-based ownership of process name and arguments

[simgrid.git] / src / simix / smx_process_private.h

diff --git a/src/simix/smx_process_private.h b/src/simix/smx_process_private.h
index c0fe279..204eb3d 100644 (file)
--- a/src/simix/smx_process_private.h
+++ b/src/simix/smx_process_private.h
@@ -11,6 +11,7 @@
 
 #include <xbt/base.h>
 
+#include <simgrid/simix.hpp>
 #include "simgrid/simix.h"
 #include "popping_private.h"
 
@@ -19,22 +20,21 @@ typedef struct s_smx_process_exit_fun {
   void *arg;
 } s_smx_process_exit_fun_t, *smx_process_exit_fun_t;
 
-typedef class s_smx_process_arg {
-public:
-  std::string name;
-  xbt_main_func_t code;
-  void *data;
-  const char *hostname;
-  int argc;
-  char **argv;
-  double kill_time;
-  xbt_dict_t properties;
-  unsigned auto_restart:1;
-} s_smx_process_arg_t, *smx_process_arg_t;
-
 namespace simgrid {
 namespace simix {
 
+class ProcessArg {
+public:
+  std::string name;
+  xbt_main_func_t code = nullptr;
+  simgrid::simix::args args;
+  void *data = nullptr;
+  const char *hostname = nullptr;
+  double kill_time = 0.0;
+  xbt_dict_t properties  = nullptr;
+  bool auto_restart = false;
+};
+
 class Process {
 public:
 
@@ -46,7 +46,7 @@ public:
 
   unsigned long pid = 0;
   unsigned long ppid = 0;
-  char *name = nullptr;         /**< @brief process name if any */
+  std::string name;
   sg_host_t host = nullptr;     /* the host on which the process is running */
   smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
   xbt_running_ctx_t *running_ctx = nullptr;
@@ -66,8 +66,7 @@ public:
   xbt_dynar_t on_exit = nullptr; /* list of functions executed when the process dies */
 
   xbt_main_func_t code = nullptr;
-  int argc = 0;
-  char **argv = nullptr;
+  simgrid::simix::args args;
   smx_timer_t kill_timer = nullptr;
   int segment_index = 0;    /*Reference to an SMPI process' data segment. Default value is -1 if not in SMPI context*/
 };
@@ -75,6 +74,8 @@ public:
 }
 }
 
+typedef simgrid::simix::ProcessArg *smx_process_arg_t;
+
 typedef simgrid::simix::Process* smx_process_t;
 
 SG_BEGIN_DECL()