-typedef struct s_smx_process_arg {
- char *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;
-
-/** @brief Process datatype */
-typedef struct s_smx_process {
- s_xbt_swag_hookup_t process_hookup; /* simix_global->process_list */
- s_xbt_swag_hookup_t synchro_hookup; /* {mutex,cond,sem}->sleeping */
- s_xbt_swag_hookup_t host_proc_hookup; /* smx_host->process_lis */
- s_xbt_swag_hookup_t destroy_hookup; /* simix_global->process_to_destroy */
-
- unsigned long pid;
- unsigned long ppid;
- char *name; /**< @brief process name if any */
- sg_host_t host; /* the host on which the process is running */
- smx_context_t context; /* the context (uctx/raw/thread) that executes the user function */
- xbt_running_ctx_t *running_ctx;
- unsigned doexception:1;
- unsigned blocked:1;
- unsigned suspended:1;
- unsigned auto_restart:1;
-
- sg_host_t new_host; /* if not null, the host on which the process must migrate to */
- smx_synchro_t waiting_synchro; /* the current blocking synchro if any */
- xbt_fifo_t comms; /* the current non-blocking communication synchros */
- xbt_dict_t properties;
+namespace simgrid {
+namespace simix {
+
+class ProcessArg {
+public:
+ std::string name;
+ std::function<void()> code;
+ void *data = nullptr;
+ const char *hostname = nullptr;
+ double kill_time = 0.0;
+ xbt_dict_t properties = nullptr;
+ bool auto_restart = false;
+};
+
+class Process {
+public:
+ Process() : actor_(this) {}
+
+ // TODO, replace with boost intrusive container hooks
+ s_xbt_swag_hookup_t process_hookup = { nullptr, nullptr }; /* simix_global->process_list */
+ s_xbt_swag_hookup_t synchro_hookup = { nullptr, nullptr }; /* {mutex,cond,sem}->sleeping */
+ s_xbt_swag_hookup_t host_proc_hookup = { nullptr, nullptr }; /* smx_host->process_lis */
+ s_xbt_swag_hookup_t destroy_hookup = { nullptr, nullptr }; /* simix_global->process_to_destroy */
+
+ unsigned long pid = 0;
+ unsigned long ppid = 0;
+ simgrid::xbt::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 */
+
+ // TODO, pack them
+ std::exception_ptr exception;
+ bool finished = false;
+ bool blocked = false;
+ bool suspended = false;
+ bool auto_restart = false;
+
+ sg_host_t new_host = nullptr; /* if not null, the host on which the process must migrate to */
+ smx_synchro_t waiting_synchro = nullptr; /* the current blocking synchro if any */
+ xbt_fifo_t comms = nullptr; /* the current non-blocking communication synchros */
+ xbt_dict_t properties = nullptr;