X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5a5b0f6ee35cb592f9345a9dafa0e29df8477ef..90f32f7c90becc16c9d62c3e2aee19b904698b3d:/src/simix/smx_host_private.h

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 66d6d4d829..a3a496fbd8 100644
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -10,6 +10,7 @@
 #include <functional>
 
 #include <xbt/base.h>
+#include <xbt/Extendable.hpp>
 
 #include "simgrid/simix.h"
 #include "popping_private.h"
@@ -19,15 +20,25 @@
 SG_BEGIN_DECL()
 
 /** @brief Host datatype from SIMIX POV */
-typedef struct s_smx_host_priv {
-  xbt_swag_t process_list;
-  xbt_dynar_t auto_restart_processes;
-  xbt_dynar_t boot_processes;
-} s_smx_host_priv_t;
+namespace simgrid {
+  namespace simix {
+    class Host {
+    public:
+      static simgrid::xbt::Extension<simgrid::s4u::Host, Host> EXTENSION_ID;
+
+      explicit Host();
+      virtual ~Host();
+
+      xbt_swag_t process_list;
+      xbt_dynar_t auto_restart_processes = nullptr;
+      xbt_dynar_t boot_processes = nullptr;
+    };
+  }
+}
+typedef simgrid::simix::Host s_smx_host_priv_t;
 
 XBT_PRIVATE void _SIMIX_host_free_process_arg(void *);
 XBT_PRIVATE void SIMIX_host_create(sg_host_t host);
-XBT_PRIVATE void SIMIX_host_destroy(void *host);
 
 XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host,
                                          const char *name,
@@ -40,7 +51,7 @@ XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host,
 
 XBT_PRIVATE void SIMIX_host_restart_processes(sg_host_t host);
 XBT_PRIVATE void SIMIX_host_autorestart(sg_host_t host);
-XBT_PRIVATE smx_activity_t SIMIX_execution_start(smx_process_t issuer, const char *name,
+XBT_PRIVATE smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name,
     double flops_amount, double priority, double bound);
 XBT_PRIVATE smx_activity_t SIMIX_execution_parallel_start(const char *name,
     int host_nb, sg_host_t *host_list,
@@ -59,17 +70,17 @@ XBT_PRIVATE sg_host_t SIMIX_vm_create(const char *name, sg_host_t ind_phys_host)
 
 XBT_PRIVATE void SIMIX_vm_destroy(sg_host_t ind_vm);
 // --
-XBT_PRIVATE void SIMIX_vm_resume(sg_host_t ind_vm, smx_process_t issuer);
+XBT_PRIVATE void SIMIX_vm_resume(sg_host_t ind_vm, smx_actor_t issuer);
 
-XBT_PRIVATE void SIMIX_vm_suspend(sg_host_t ind_vm, smx_process_t issuer);
+XBT_PRIVATE void SIMIX_vm_suspend(sg_host_t ind_vm, smx_actor_t issuer);
 // --
-XBT_PRIVATE void SIMIX_vm_save(sg_host_t ind_vm, smx_process_t issuer);
+XBT_PRIVATE void SIMIX_vm_save(sg_host_t ind_vm, smx_actor_t issuer);
 
-XBT_PRIVATE void SIMIX_vm_restore(sg_host_t ind_vm, smx_process_t issuer);
+XBT_PRIVATE void SIMIX_vm_restore(sg_host_t ind_vm, smx_actor_t issuer);
 // --
 XBT_PRIVATE void SIMIX_vm_start(sg_host_t ind_vm);
 
-XBT_PRIVATE void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_process_t issuer);
+XBT_PRIVATE void SIMIX_vm_shutdown(sg_host_t ind_vm, smx_actor_t issuer);
 // --
 
 XBT_PRIVATE e_surf_vm_state_t SIMIX_vm_get_state(sg_host_t ind_vm);