Remove SIMIX_host_get_properties() and SIMIX_host_get_process_list()

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index 0f61893..3d1a48a 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -200,13 +200,15 @@ bool Host::isOff() {
 /** Get the properties assigned to a host */
 xbt_dict_t Host::getProperties()
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, this));
+  return simgrid::simix::kernel(std::bind(sg_host_get_properties, this));
 }
 
 /** Get the processes attached to the host */
 xbt_swag_t Host::getProcessList()
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, this));
+  return simgrid::simix::kernel([&]() {
+    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+  });
 }
 
 /** Get the peak power of a host */

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 92cf8ee..e9f1847 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -166,18 +166,6 @@ const char* SIMIX_host_self_get_name(void)
   return SIMIX_host_get_name(host);
 }
 
-xbt_dict_t SIMIX_host_get_properties(sg_host_t host){
-  return sg_host_get_properties(host);
-}
-
-
-xbt_swag_t SIMIX_host_get_process_list(sg_host_t host){
-  smx_host_priv_t host_priv = sg_host_simix(host);
-
-  return host_priv->process_list;
-}
-
-
 double SIMIX_host_get_current_power_peak(sg_host_t host) {
          return surf_host_get_current_power_peak(host);
 }

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 0709849..9408ca1 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -37,8 +37,6 @@ 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 xbt_dict_t SIMIX_host_get_properties(sg_host_t host);
-XBT_PRIVATE xbt_swag_t SIMIX_host_get_process_list(sg_host_t host);
 XBT_PRIVATE double SIMIX_host_get_current_power_peak(sg_host_t host);
 XBT_PRIVATE double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index);
 XBT_PRIVATE smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,