-typedef struct simdata_process {
- msg_host_t m_host; /* the host on which the process is running */
- msg_host_t put_host; /* used for debugging purposes */
- smx_activity_t waiting_action;
- msg_task_t waiting_task;
- msg_error_t last_errno; /* the last value returned by a MSG_function */
-
- void* data; /* user data */
-} s_simdata_process_t, *simdata_process_t;
-
-typedef struct process_arg {
- const char *name;
- xbt_main_func_t code;
- void *data;
- msg_host_t m_host;
- int argc;
- char **argv;
- double kill_time;
-} s_process_arg_t, *process_arg_t;
-
-typedef struct msg_comm {
- smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
- msg_task_t task_sent; /* task sent (NULL for the receiver) */
- msg_task_t *task_received; /* where the task will be received (NULL for the sender) */
- msg_error_t status; /* status of the communication once finished */
-} s_msg_comm_t;
-
-/******************************* VM *************************************/
-typedef struct dirty_page {
- double prev_clock;
- double prev_remaining;
- msg_task_t task;
-} s_dirty_page, *dirty_page_t;
-
-XBT_PUBLIC_DATA(const char*) MSG_vm_get_property_value(msg_vm_t vm, const char *name);
-XBT_PUBLIC_DATA(xbt_dict_t) MSG_vm_get_properties(msg_vm_t vm);
-XBT_PUBLIC_DATA(void) MSG_vm_set_property_value(msg_vm_t vm, const char *name, void *value, void_f_pvoid_t free_ctn);
-XBT_PUBLIC_DATA(msg_vm_t) MSG_vm_get_by_name(const char *name);
-XBT_PUBLIC_DATA(const char*) MSG_vm_get_name(msg_vm_t vm);
+namespace simgrid {
+namespace msg {
+class ActorExt {
+public:
+ explicit ActorExt(void* d) : data(d) {}
+ msg_error_t errno_ = MSG_OK; /* the last value returned by a MSG_function */
+ void* data = nullptr; /* user data */
+};
+
+class Comm {
+public:
+ msg_task_t task_sent; /* task sent (NULL for the receiver) */
+ msg_task_t* task_received; /* where the task will be received (NULL for the sender) */
+ smx_activity_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ msg_error_t status = MSG_OK; /* status of the communication once finished */
+ Comm(msg_task_t sent, msg_task_t* received, smx_activity_t comm)
+ : task_sent(sent), task_received(received), s_comm(std::move(comm))
+ {
+ }
+};
+}
+}