X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8b225db86e2cdcc338b951e4da8d2d46707778b..dd38b27f7d03f21920f17eda3083b16b19465824:/src/surf/workstation_interface.cpp diff --git a/src/surf/workstation_interface.cpp b/src/surf/workstation_interface.cpp index ba424e99c3..6b021c5b5f 100644 --- 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(){ @@ -375,7 +376,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 +384,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;