initialize fields at declaration, not everywhere in code

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

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 59bdfcd..a8d80c7 100644 (file)
--- 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,38 +132,34 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-
-Cpu::Cpu(){
+Cpu::Cpu()
+{
 }
 
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-         int core, double powerPeak, double powerScale,
+         int core, double speedPeak, double speedScale,
          e_surf_resource_state_t stateInitial)
  : Resource(model, name, props, stateInitial)
  , m_core(core)
- , m_speedPeak(powerPeak)
- , m_speedScale(powerScale)
- , p_constraintCore(NULL)
- , p_constraintCoreId(NULL)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
 {
 
 }
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-        lmm_constraint_t constraint, int core, double powerPeak,
-        double powerScale, e_surf_resource_state_t stateInitial)
+        lmm_constraint_t constraint, int core, double speedPeak,
+        double speedScale, e_surf_resource_state_t stateInitial)
  : Resource(model, name, props, constraint, stateInitial)
  , m_core(core)
- , m_speedPeak(powerPeak)
- , m_speedScale(powerScale)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
 {
   /* At now, we assume that a VM does not have a multicore CPU. */
   if (core > 1)
     xbt_assert(model == surf_cpu_model_pm);
 
-  p_constraintCore = NULL;
-  p_constraintCoreId = NULL;
   if (model->getUpdateMechanism() != UM_UNDEFINED) {
        p_constraintCore = xbt_new(lmm_constraint_t, core);
        p_constraintCoreId = xbt_new(void*, core);
@@ -174,13 +174,13 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
 }
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-  lmm_constraint_t constraint, int core, double powerPeak, double powerScale)
-: Cpu(model, name, props, constraint, core, powerPeak, powerScale, SURF_RESOURCE_ON)
+  lmm_constraint_t constraint, int core, double speedPeak, double speedScale)
+: Cpu(model, name, props, constraint, core, speedPeak, speedScale, SURF_RESOURCE_ON)
 {}
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-  int core, double powerPeak, double powerScale)
-: Cpu(model, name, props, core, powerPeak, powerScale, SURF_RESOURCE_ON)
+  int core, double speedPeak, double speedScale)
+: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON)
 {}
 
 Cpu::~Cpu(){
@@ -328,3 +328,6 @@ void CpuAction::setState(e_surf_action_state_t state){
   Action::setState(state);
   surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state);
 }
+
+}
+}