more dupplicated code ritual sacrifice and cleanups

[simgrid.git] / src / simgrid / host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 701b7f4..f3701a7 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -14,6 +14,13 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
 
+extern xbt_dict_t host_list; // FIXME:killme don't dupplicate the content of s4u::Host this way
+
+void sg_host_exit()
+{
+  xbt_dict_free(&host_list);
+}
+
 size_t sg_host_count()
 {
   return xbt_dict_length(host_list);
@@ -91,14 +98,9 @@ void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
 }
 
 // ========== Simix layer =============
+#include "src/simix/smx_host_private.h"
 smx_host_priv_t sg_host_simix(sg_host_t host){
-  return (smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL);
-}
-void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
-  host->extension_set(SIMIX_HOST_LEVEL, smx_host);
-}
-void sg_host_simix_destroy(sg_host_t host) {
-  host->extension_set(SIMIX_HOST_LEVEL, nullptr);
+  return host->extension<simgrid::simix::Host>();
 }
 
 // ========= storage related functions ============