X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..00db5795b9e8a06e2aac8d8ec9ea2784ab63542f:/src/surf/cpu_interface.cpp

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index 23929b021b..a8d80c7106 100644
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -1,10 +1,11 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "cpu_interface.hpp"
+#include "plugins/energy.hpp"
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
@@ -13,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 *
  *************/
@@ -29,20 +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_parse_init(sg_platf_host_cbarg_t host){
-  surf_cpu_model_pm->createCpu(
-        host->id,
-        host->power_peak,
-        host->pstate,
-        host->power_scale,
-        host->power_trace,
-        host->core_amount,
-        host->initial_state,
-        host->state_trace,
-        host->properties);
-}
-
 void cpu_add_traces(){
   surf_cpu_model_pm->addTraces();
 }
@@ -50,6 +41,7 @@ void cpu_add_traces(){
 /*********
  * Model *
  *********/
+
 void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
 {
   CpuAction *action;
@@ -140,37 +132,34 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-
-Cpu::Cpu(){
-  surf_callback_emit(cpuCreatedCallbacks, this);
+Cpu::Cpu()
+{
 }
 
+
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-		 int core, double powerPeak, double powerScale)
- : Resource(model, name, props)
+         int core, double speedPeak, double speedScale,
+         e_surf_resource_state_t stateInitial)
+ : Resource(model, name, props, stateInitial)
  , m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
- , p_constraintCore(NULL)
- , p_constraintCoreId(NULL)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
 {
-  surf_callback_emit(cpuCreatedCallbacks, this);
+
 }
 
 Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-		 lmm_constraint_t constraint, int core, double powerPeak, double powerScale)
- : Resource(model, name, props, constraint)
+        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_powerPeak(powerPeak)
- , m_powerScale(powerScale)
+ , m_speedPeak(speedPeak)
+ , m_speedScale(speedScale)
 {
-  surf_callback_emit(cpuCreatedCallbacks, this);
   /* 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);
@@ -179,11 +168,21 @@ Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
     for (i = 0; i < core; i++) {
       /* just for a unique id, never used as a string. */
       p_constraintCoreId[i] = bprintf("%s:%i", name, i);
-      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_powerScale * m_powerPeak);
+      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], m_speedScale * m_speedPeak);
     }
   }
 }
 
+Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
+  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 speedPeak, double speedScale)
+: Cpu(model, name, props, core, speedPeak, speedScale, SURF_RESOURCE_ON)
+{}
+
 Cpu::~Cpu(){
   surf_callback_emit(cpuDestructedCallbacks, this);
   if (p_constraintCoreId){
@@ -198,18 +197,18 @@ Cpu::~Cpu(){
 
 double Cpu::getCurrentPowerPeak()
 {
-  return m_powerPeak;
+  return m_speedPeak;
 }
 
 double Cpu::getSpeed(double load)
 {
-  return load * m_powerPeak;
+  return load * m_speedPeak;
 }
 
 double Cpu::getAvailableSpeed()
 {
 /* number between 0 and 1 */
-  return m_powerScale;
+  return m_speedScale;
 }
 
 int Cpu::getCore()
@@ -223,6 +222,7 @@ void Cpu::setState(e_surf_resource_state_t state)
   Resource::setState(state);
   surf_callback_emit(cpuStateChangedCallbacks, this, old, state);
 }
+
 /**********
  * Action *
  **********/
@@ -328,3 +328,6 @@ void CpuAction::setState(e_surf_action_state_t state){
   Action::setState(state);
   surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state);
 }
+
+}
+}