Clean surf cpu cas01

[simgrid.git] / src / surf / vm_workstation_hl13.cpp

diff --git a/src/surf/vm_workstation_hl13.cpp b/src/surf/vm_workstation_hl13.cpp
index b5fe764..054e349 100644 (file)
--- a/src/surf/vm_workstation_hl13.cpp
+++ b/src/surf/vm_workstation_hl13.cpp
@@ -113,7 +113,7 @@ double WorkstationVMHL13Model::shareResources(double now)
   /* iterate for all virtual machines */
   for (WorkstationVMModel::vm_list_t::iterator iter =
          WorkstationVMModel::ws_vms.begin();
-       iter !=  WorkstationVMModel::ws_vms.begin(); ++iter) {
+       iter !=  WorkstationVMModel::ws_vms.end(); ++iter) {
 
     WorkstationVMPtr ws_vm = &*iter;
     CpuPtr cpu = static_cast<CpuPtr>(ws_vm->p_cpu);
@@ -135,7 +135,7 @@ double WorkstationVMHL13Model::shareResources(double now)
   adjustWeightOfDummyCpuActions();
 
   double min_by_cpu = p_cpuModel->shareResources(now);
-  double min_by_net = surf_network_model->shareResources(now);
+  double min_by_net = (strcmp(surf_network_model->getName(), "network NS3")) ? surf_network_model->shareResources(now) : -1;
   double min_by_sto = -1;
   if (p_cpuModel == surf_cpu_model_pm)
        min_by_sto = surf_storage_model->shareResources(now);
@@ -158,7 +158,7 @@ double WorkstationVMHL13Model::shareResources(double now)
   /* iterate for all virtual machines */
   for (WorkstationVMModel::vm_list_t::iterator iter =
          WorkstationVMModel::ws_vms.begin();
-       iter !=  WorkstationVMModel::ws_vms.begin(); ++iter) {
+       iter !=  WorkstationVMModel::ws_vms.end(); ++iter) {
 
     {
 #if 0
@@ -251,8 +251,8 @@ WorkstationVMHL13::WorkstationVMHL13(WorkstationVMModelPtr model, const char* na
    * Do xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu) if you get the resource. */
 
   p_cpu = static_cast<CpuCas01ModelPtr>(surf_cpu_model_vm)->createResource(name, // name
-      sub_cpu->p_powerPeakList,        // host->power_peak,
-      sub_cpu->m_pstate,
+      sub_cpu->getPowerPeakList(),        // host->power_peak,
+      sub_cpu->getPState(),
       1,                          // host->power_scale,
       NULL,                       // host->power_trace,
       1,                          // host->core_amount,