remove free of return set in user code for these tests too.

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

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 5a7f0fa..111f9b3 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -111,7 +111,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
       }
     }
   } else {
-    XBT_INFO("Host %s is already off",h->getName().c_str());
+    XBT_INFO("Host %s is already off",h->name().c_str());
   }
 }
 
@@ -339,9 +339,11 @@ 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_host_model_t ws_model = surf_host_get_model(host_list[0]);
+  surf_host_model_t ws_model =
+    host_list[0]->extension<simgrid::surf::Host>()->getModel();
   for (i = 1; i < host_nb; i++) {
-    surf_host_model_t ws_model_tmp = surf_host_get_model(host_list[0]);
+    surf_host_model_t ws_model_tmp =
+      host_list[i]->extension<simgrid::surf::Host>()->getModel();
     if (ws_model_tmp != ws_model) {
       XBT_CRITICAL("mixing VMs and PMs is not supported");
       DIE_IMPOSSIBLE;
@@ -351,7 +353,7 @@ smx_synchro_t SIMIX_process_parallel_execute(const char *name,
   /* set surf's synchro */
   if (!MC_is_active() && !MC_record_replay_is_active()) {
     synchro->execution.surf_exec =
-      surf_host_model_execute_parallel_task(surf_host_model,
+      surf_host_model->executeParallelTask(
                  host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
 
     synchro->execution.surf_exec->setData(synchro);