New: MSG_host_get_pstate() and smpi_get_host_pstate()

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

diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp
index ba424e9..fc2bcde 100644 (file)
--- a/src/surf/workstation_interface.cpp
+++ b/src/surf/workstation_interface.cpp
@@ -125,6 +125,7 @@ void Workstation::setState(e_surf_resource_state_t state){
   e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
   surf_callback_emit(workstationStateChangedCallbacks, this, old, state);
+  p_cpu->setState(state);
 }
 
 int Workstation::getCore(){
@@ -154,9 +155,13 @@ int Workstation::getNbPstates()
   return p_cpu->getNbPstates();
 }
 
-void Workstation::setPowerPeakAt(int pstate_index)
+void Workstation::setPstate(int pstate_index)
 {
-       p_cpu->setPowerPeakAt(pstate_index);
+       p_cpu->setPstate(pstate_index);
+}
+int Workstation::getPstate()
+{
+       return p_cpu->getPstate();
 }
 
 xbt_dict_t Workstation::getProperties()
@@ -375,7 +380,7 @@ int Workstation::fileMove(surf_file_t fd, const char* fullpath){
 
 xbt_dynar_t Workstation::getVms()
 {
-  xbt_dynar_t dyn = xbt_dynar_new(sizeof(smx_host_t), NULL);
+  xbt_dynar_t dyn = xbt_dynar_new(sizeof(WorkstationVMPtr), NULL);
 
   /* iterate for all virtual machines */
   for (WorkstationVMModel::vm_list_t::iterator iter =
@@ -383,8 +388,8 @@ xbt_dynar_t Workstation::getVms()
        iter !=  WorkstationVMModel::ws_vms.end(); ++iter) {
 
     WorkstationVMPtr ws_vm = &*iter;
-    if (this == ws_vm-> p_subWs)
-      xbt_dynar_push(dyn, &ws_vm->p_subWs);
+    if (this == ws_vm->p_subWs)
+      xbt_dynar_push(dyn, &ws_vm);
   }
 
   return dyn;