obey our coding standards + kill dead code

[simgrid.git] / src / msg / msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index d1b9ad2..b0aea86 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -14,8 +14,6 @@
 
 #include <xbt/Extendable.hpp>
 
-SG_BEGIN_DECL()
-
 /**************** datatypes **********************************/
 /**************************** Host Extension *********************************/
 namespace simgrid {
@@ -75,14 +73,12 @@ typedef struct simdata_file {
 
 /******************************* Process *************************************/
 
-typedef struct simdata_process {
-  msg_host_t m_host;              /* the host on which the process is running */
-  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;
+class MsgActorExt {
+public:
+  msg_host_t host_; /* the host on which the process is running */
+  msg_error_t errno_ = MSG_OK;  /* the last value returned by a MSG_function */
+  void* data = nullptr; /* user data */
+};
 
 typedef struct process_arg {
   const char *name;
@@ -109,10 +105,11 @@ typedef struct MSG_Global {
   void_f_pvoid_t process_data_cleanup;
 } s_MSG_Global_t, *MSG_Global_t;
 
-/*extern MSG_Global_t msg_global;*/
 XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 
 /*************************************************************/
+SG_BEGIN_DECL()
+
 XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
 XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
 XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);