kill two more useless calls

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

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 17ae79b..91b7ef9 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -46,7 +46,7 @@ void SIMIX_host_on(sg_host_t h)
 
   if (h->isOff()) {
     simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
-    surf_host_turn_on(surf_host);
+    surf_host->turnOn();
 
     unsigned int cpt;
     smx_process_arg_t arg;
@@ -100,7 +100,7 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
 
   if (h->isOn()) {
     simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
-    surf_host_turn_off(surf_host);
+    surf_host->turnOff();
 
     /* Clean Simulator data */
     if (xbt_swag_size(host->process_list) != 0) {
@@ -186,16 +186,6 @@ double SIMIX_host_get_power_peak_at(sg_host_t host, int pstate_index) {
          return surf_host_get_power_peak_at(host, pstate_index);
 }
 
-void SIMIX_host_set_pstate(sg_host_t host, int pstate_index) {
-         surf_host_set_pstate(host, pstate_index);
-}
-double SIMIX_host_get_wattmin_at(sg_host_t host,int pstate) {
-         return surf_host_get_wattmin_at(host,pstate);
-}
-double SIMIX_host_get_wattmax_at(sg_host_t host,int pstate) {
-         return surf_host_get_wattmax_at(host,pstate);
-}
-
 void _SIMIX_host_free_process_arg(void *data)
 {
   smx_process_arg_t arg = *(smx_process_arg_t*)data;
@@ -323,7 +313,7 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
   /* set surf's action */
   if (!MC_is_active() && !MC_record_replay_is_active()) {
 
-    synchro->execution.surf_exec = surf_host_execute(issuer->host, flops_amount);
+    synchro->execution.surf_exec = issuer->host->p_cpu->execute(flops_amount);
     synchro->execution.surf_exec->setData(synchro);
     synchro->execution.surf_exec->setPriority(priority);