X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd59c94828d56624b725b65c21dee0a7c5281e7f..638b21d2071c77f39da2f322156f05f75bf91517:/src/surf/cpu_interface.cpp diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp index bc366f94be..2b7c2e321e 100644 --- a/src/surf/cpu_interface.cpp +++ b/src/surf/cpu_interface.cpp @@ -14,8 +14,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, int autoload_surf_cpu_model = 1; void_f_void_t surf_cpu_model_init_preparse = NULL; -CpuModel *surf_cpu_model_pm; -CpuModel *surf_cpu_model_vm; +simgrid::surf::CpuModel *surf_cpu_model_pm; +simgrid::surf::CpuModel *surf_cpu_model_vm; + +namespace simgrid { +namespace surf { + /************* * Callbacks * *************/ @@ -30,7 +34,6 @@ surf_callback(void, Cpu*) cpuCreatedCallbacks; surf_callback(void, Cpu*) cpuDestructedCallbacks; surf_callback(void, Cpu*, e_surf_resource_state_t, e_surf_resource_state_t) cpuStateChangedCallbacks; surf_callback(void, CpuAction*, e_surf_action_state_t, e_surf_action_state_t) cpuActionStateChangedCallbacks; - void cpu_add_traces(){ surf_cpu_model_pm->addTraces(); } @@ -38,6 +41,7 @@ void cpu_add_traces(){ /********* * Model * *********/ + void CpuModel::updateActionsStateLazy(double now, double /*delta*/) { CpuAction *action; @@ -128,7 +132,6 @@ void CpuModel::updateActionsStateFull(double now, double delta) /************ * Resource * ************/ - Cpu::Cpu(){ } @@ -328,3 +331,6 @@ void CpuAction::setState(e_surf_action_state_t state){ Action::setState(state); surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state); } + +} +}