Fix stupidly broken indexing in SIMIX_process_parallel_execute()

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

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 17ae79b..f0d4fdd 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) {
@@ -166,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;
@@ -323,7 +293,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->pimpl_cpu->execute(flops_amount);
     synchro->execution.surf_exec->setData(synchro);
     synchro->execution.surf_exec->setPriority(priority);
 
@@ -335,7 +305,7 @@ smx_synchro_t SIMIX_process_execute(smx_process_t issuer, const char *name,
       /* just a double check to confirm that this host is the host where this task is running. */
       xbt_assert(synchro->execution.host == issuer->host);
       static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
-        ->setAffinity(issuer->host->p_cpu, affinity_mask);
+        ->setAffinity(issuer->host->pimpl_cpu, affinity_mask);
     }
   }
 
@@ -371,7 +341,7 @@ smx_synchro_t SIMIX_process_parallel_execute(const char *name,
    * them. */
   surf_host_model_t ws_model = surf_host_get_model(host_list[0]);
   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 = surf_host_get_model(host_list[i]);
     if (ws_model_tmp != ws_model) {
       XBT_CRITICAL("mixing VMs and PMs is not supported");
       DIE_IMPOSSIBLE;
@@ -442,7 +412,7 @@ void SIMIX_process_execution_set_affinity(smx_synchro_t synchro, sg_host_t host,
     /* just a double check to confirm that this host is the host where this task is running. */
     xbt_assert(synchro->execution.host == host);
     static_cast<simgrid::surf::CpuAction*>(synchro->execution.surf_exec)
-      ->setAffinity(host->p_cpu, mask);
+      ->setAffinity(host->pimpl_cpu, mask);
   }
 }
 
@@ -559,31 +529,3 @@ void SIMIX_set_category(smx_synchro_t synchro, const char *category)
     synchro->comm.surf_comm->setCategory(category);
   }
 }
-
-/**
- * \brief Function to get the parameters of the given the SIMIX host.
- *
- * \param host the host to get_phys_host (a sg_host_t)
- * \param param the parameter object space to be overwritten (a ws_params_t)
- */
-void SIMIX_host_get_params(sg_host_t ind_vm, vm_params_t params)
-{
-  ind_vm->extension<simgrid::surf::Host>()->getParams(params);
-}
-
-void SIMIX_host_set_params(sg_host_t ind_vm, vm_params_t params)
-{
-  ind_vm->extension<simgrid::surf::Host>()->setParams(params);
-}
-
-xbt_dict_t SIMIX_host_get_mounted_storage_list(sg_host_t host)
-{
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-  return host->extension<simgrid::surf::Host>()->getMountedStorageList();
-}
-
-xbt_dynar_t SIMIX_host_get_attached_storage_list(sg_host_t host)
-{
-  xbt_assert((host != NULL), "Invalid parameters (simix host is NULL)");
-  return host->extension<simgrid::surf::Host>()->getAttachedStorageList();
-}