this is C++

[simgrid.git] / src / simix / smx_host.cpp

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 363423b..92b2b5b 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -162,7 +162,7 @@ const char* SIMIX_host_self_get_name(void)
 }
 
 xbt_dict_t SIMIX_host_get_properties(sg_host_t host){
-  return surf_host_get_properties(surf_host_resource_priv(host));
+  return sg_host_get_properties(host);
 }
 
 
@@ -324,7 +324,11 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
 
     /* Note (hypervisor): for multicore, the bound value being passed to the
      * surf layer should not be zero (i.e., unlimited). It should be the
-     * capacity of a CPU core. */
+     * capacity of a CPU core.
+     *
+     * FIXME: this should probably not be part of Simix but of Surf directly.
+     * That bound is part of the performance model, not of the synchronization
+     */
     if (bound == 0)
       surf_cpu_action_set_bound(synchro->execution.surf_exec, sg_host_get_speed(issuer->host));
     else
@@ -367,9 +371,9 @@ smx_synchro_t SIMIX_process_parallel_execute(const char *name,
   /* FIXME: what happens if host_list contains VMs and PMs. If
    * execute_parallel_task() does not change the state of the model, we can mix
    * them. */
-  surf_model_t ws_model = surf_resource_model(host_list[0], SURF_HOST_LEVEL);
+  surf_host_model_t ws_model = surf_host_get_model(host_list[0]);
   for (i = 1; i < host_nb; i++) {
-    surf_model_t ws_model_tmp = surf_resource_model(host_list[i], SURF_HOST_LEVEL);
+    surf_host_model_t ws_model_tmp = surf_host_get_model(host_list[0]);
     if (ws_model_tmp != ws_model) {
       XBT_CRITICAL("mixing VMs and PMs is not supported");
       DIE_IMPOSSIBLE;