Remove SIMIX_host_get_current_power_peak() and SIMIX_host_get_power_peak_at()

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

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index dce8607..6bea3c1 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -10,6 +10,7 @@
 #include "xbt/dict.h"
 #include "mc/mc.h"
 #include "src/mc/mc_replay.h"
+#include "src/surf/host_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix,
                                 "SIMIX hosts");
@@ -43,8 +44,9 @@ void SIMIX_host_on(sg_host_t h)
 
   xbt_assert((host != NULL), "Invalid parameters");
 
-  if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_OFF) {
-    surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_ON);
+  if (h->isOff()) {
+    simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+    surf_host->turnOn();
 
     unsigned int cpt;
     smx_process_arg_t arg;
@@ -96,8 +98,9 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
 
   xbt_assert((host != NULL), "Invalid parameters");
 
-  if (surf_host_get_state(surf_host_resource_priv(h))==SURF_RESOURCE_ON) {
-       surf_host_set_state(surf_host_resource_priv(h), SURF_RESOURCE_OFF);
+  if (h->isOn()) {
+    simgrid::surf::Host* surf_host = h->extension<simgrid::surf::Host>();
+    surf_host->turnOff();
 
     /* Clean Simulator data */
     if (xbt_swag_size(host->process_list) != 0) {
@@ -107,6 +110,8 @@ void SIMIX_host_off(sg_host_t h, smx_process_t issuer)
         XBT_DEBUG("Killing %s on %s by %s", process->name,  sg_host_get_name(process->host), issuer->name);
       }
     }
+  } else {
+    XBT_INFO("Host %s is already off",h->getName().c_str());
   }
 }
 
@@ -161,36 +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);
-}
-
-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;
@@ -240,7 +215,7 @@ void SIMIX_host_add_auto_restart_process(sg_host_t host,
   arg->properties = properties;
   arg->auto_restart = auto_restart;
 
-  if( sg_host_get_state(host) == SURF_RESOURCE_OFF
+  if( ! sg_host_is_on(host)
       && !xbt_dict_get_or_null(watched_hosts_lib,sg_host_get_name(host))){
     xbt_dict_set(watched_hosts_lib,sg_host_get_name(host),host,NULL);
     XBT_DEBUG("Have pushed host %s to watched_hosts_lib because state == SURF_RESOURCE_OFF",sg_host_get_name(host));
@@ -318,22 +293,19 @@ 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);
-    surf_action_set_data(synchro->execution.surf_exec, synchro);
-    surf_action_set_priority(synchro->execution.surf_exec, priority);
+    synchro->execution.surf_exec = issuer->host->pimpl_cpu->execute(flops_amount);
+    synchro->execution.surf_exec->setData(synchro);
+    synchro->execution.surf_exec->setPriority(priority);
 
-    /* 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. */
-    if (bound == 0)
-      surf_cpu_action_set_bound(synchro->execution.surf_exec, sg_host_get_speed(issuer->host));
-    else
-      surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+    if (bound != 0)
+      static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+        ->setBound(bound);
 
     if (affinity_mask != 0) {
       /* just a double check to confirm that this host is the host where this task is running. */
       xbt_assert(synchro->execution.host == issuer->host);
-      surf_cpu_action_set_affinity(synchro->execution.surf_exec, issuer->host, affinity_mask);
+      static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+        ->setAffinity(issuer->host->pimpl_cpu, affinity_mask);
     }
   }
 
@@ -382,7 +354,7 @@ smx_synchro_t SIMIX_process_parallel_execute(const char *name,
       surf_host_model_execute_parallel_task(surf_host_model,
                  host_nb, host_list_cpy, flops_amount, bytes_amount, rate);
 
-    surf_action_set_data(synchro->execution.surf_exec, synchro);
+    synchro->execution.surf_exec->setData(synchro);
   }
   XBT_DEBUG("Create parallel execute synchro %p", synchro);
 
@@ -393,7 +365,7 @@ void SIMIX_process_execution_destroy(smx_synchro_t synchro){
   XBT_DEBUG("Destroy synchro %p", synchro);
 
   if (synchro->execution.surf_exec) {
-    surf_action_unref(synchro->execution.surf_exec);
+    synchro->execution.surf_exec->unref();
     synchro->execution.surf_exec = NULL;
   }
   xbt_free(synchro->name);
@@ -404,7 +376,7 @@ void SIMIX_process_execution_cancel(smx_synchro_t synchro){
   XBT_DEBUG("Cancel synchro %p", synchro);
 
   if (synchro->execution.surf_exec)
-    surf_action_cancel(synchro->execution.surf_exec);
+    synchro->execution.surf_exec->cancel();
 }
 
 double SIMIX_process_execution_get_remains(smx_synchro_t synchro){
@@ -423,13 +395,14 @@ e_smx_state_t SIMIX_process_execution_get_state(smx_synchro_t synchro){
 void SIMIX_process_execution_set_priority(smx_synchro_t synchro, double priority){
 
   if(synchro->execution.surf_exec)
-       surf_action_set_priority(synchro->execution.surf_exec, priority);
+       synchro->execution.surf_exec->setPriority(priority);
 }
 
 void SIMIX_process_execution_set_bound(smx_synchro_t synchro, double bound){
 
   if(synchro->execution.surf_exec)
-       surf_cpu_action_set_bound(synchro->execution.surf_exec, bound);
+       static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+    ->setBound(bound);
 }
 
 void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host, unsigned long mask){
@@ -438,7 +411,8 @@ void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host,
   if (synchro->execution.surf_exec) {
     /* just a double check to confirm that this host is the host where this task is running. */
     xbt_assert(synchro->execution.host == host);
-    surf_cpu_action_set_affinity(synchro->execution.surf_exec, host, mask);
+    static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
+      ->setAffinity(host->pimpl_cpu, mask);
   }
 }
 
@@ -465,13 +439,13 @@ void simcall_HANDLER_process_execution_wait(smx_simcall_t simcall, smx_synchro_t
 void SIMIX_host_execution_suspend(smx_synchro_t synchro)
 {
   if(synchro->execution.surf_exec)
-    surf_action_suspend(synchro->execution.surf_exec);
+    synchro->execution.surf_exec->suspend();
 }
 
 void SIMIX_host_execution_resume(smx_synchro_t synchro)
 {
   if(synchro->execution.surf_exec)
-    surf_action_resume(synchro->execution.surf_exec);
+    synchro->execution.surf_exec->resume();
 }
 
 void SIMIX_execution_finish(smx_synchro_t synchro)
@@ -504,7 +478,7 @@ void SIMIX_execution_finish(smx_synchro_t synchro)
             (int)synchro->state);
     }
     /* check if the host is down */
-    if (surf_host_get_state(surf_host_resource_priv(simcall->issuer->host)) != SURF_RESOURCE_ON) {
+    if (simcall->issuer->host->isOff()) {
       simcall->issuer->context->iwannadie = 1;
     }
 
@@ -522,11 +496,11 @@ void SIMIX_post_host_execute(smx_synchro_t synchro)
 {
   if (synchro->type == SIMIX_SYNC_EXECUTE && /* FIMXE: handle resource failure
                                                * for parallel tasks too */
-      surf_host_get_state(surf_host_resource_priv(synchro->execution.host)) == SURF_RESOURCE_OFF) {
+      synchro->execution.host->isOff()) {
     /* If the host running the synchro failed, notice it so that the asking
      * process can be killed if it runs on that host itself */
     synchro->state = SIMIX_FAILED;
-  } else if (surf_action_get_state(synchro->execution.surf_exec) == SURF_ACTION_FAILED) {
+  } else if (synchro->execution.surf_exec->getState() == SURF_ACTION_FAILED) {
     /* If the host running the synchro didn't fail, then the synchro was
      * canceled */
     synchro->state = SIMIX_CANCELED;
@@ -535,7 +509,7 @@ void SIMIX_post_host_execute(smx_synchro_t synchro)
   }
 
   if (synchro->execution.surf_exec) {
-    surf_action_unref(synchro->execution.surf_exec);
+    synchro->execution.surf_exec->unref();
     synchro->execution.surf_exec = NULL;
   }
 
@@ -550,9 +524,9 @@ void SIMIX_set_category(smx_synchro_t synchro, const char *category)
 {
   if (synchro->state != SIMIX_RUNNING) return;
   if (synchro->type == SIMIX_SYNC_EXECUTE){
-    surf_action_set_category(synchro->execution.surf_exec, category);
+    synchro->execution.surf_exec->setCategory(category);
   }else if (synchro->type == SIMIX_SYNC_COMMUNICATE){
-    surf_action_set_category(synchro->comm.surf_comm, category);
+    synchro->comm.surf_comm->setCategory(category);
   }
 }
 
@@ -564,24 +538,22 @@ void SIMIX_set_category(smx_synchro_t synchro, const char *category)
  */
 void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
 {
-  /* jump to ws_get_params(). */
-  surf_host_get_params(ind_vm, params);
+  ind_vm->extension<simgrid::surf::Host>()->getParams(params);
 }
 
 void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
 {
-  /* jump to ws_set_params(). */
-  surf_host_set_params(ind_vm, params);
+  ind_vm->extension<simgrid::surf::Host>()->setParams(params);
 }
 
-xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host){
+xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host)
+{
   xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_host_get_mounted_storage_list(host);
+  return host->extension<simgrid::surf::Host>()->getMountedStorageList();
 }
 
-xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host){
+xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host)
+{
   xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-
-  return surf_host_get_attached_storage_list(host);
+  return host->extension<simgrid::surf::Host>()->getAttachedStorageList();
 }