Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Energy were not computed correctly for parallel tasks.
[simgrid.git] / src / surf / cpu_interface.cpp
index 03cea6d..ccdad63 100644 (file)
@@ -4,8 +4,10 @@
 /* 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 <xbt/dynar.h>
 #include "cpu_interface.hpp"
 #include "plugins/energy.hpp"
+#include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 
 XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
@@ -14,43 +16,33 @@ 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 *
  *************/
 
-Cpu *getActionCpu(CpuAction *action) {
-  return static_cast<Cpu*>(lmm_constraint_id(lmm_get_cnst_from_var
-                                        (action->getModel()->getMaxminSystem(),
-                                        action->getVariable(), 0)));
-}
+std::list<Cpu*> getActionCpus(CpuAction *action) {
+  std::list<Cpu*> retlist;
+  lmm_system_t sys = action->getModel()->getMaxminSystem();
+  int llen = lmm_get_number_of_cnst_from_var(sys, action->getVariable());
 
-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);
+  for(int i = 0; i<llen; i++) {
+    retlist.push_back( (Cpu*)(lmm_constraint_id( lmm_get_cnst_from_var(sys, action->getVariable(), i) )) );
+  }
+  return retlist;
 }
 
-void cpu_add_traces(){
-  surf_cpu_model_pm->addTraces();
-}
+simgrid::xbt::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
 
 /*********
  * Model *
  *********/
+
 void CpuModel::updateActionsStateLazy(double now, double /*delta*/)
 {
   CpuAction *action;
@@ -104,7 +96,7 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 
   for(ActionList::iterator it(running_actions->begin()), itNext=it, itend(running_actions->end())
      ; it != itend ; it=itNext) {
-       ++itNext;
+  ++itNext;
     action = static_cast<CpuAction*>(&*it);
     if (TRACE_is_enabled()) {
       Cpu *x = static_cast<Cpu*> (lmm_constraint_id(lmm_get_cnst_from_var(getMaxminSystem(), action->getVariable(), 0)) );
@@ -141,107 +133,134 @@ void CpuModel::updateActionsStateFull(double now, double delta)
 /************
  * Resource *
  ************/
-
-Cpu::Cpu(){
-  surf_callback_emit(cpuCreatedCallbacks, this);
-  physCpu = NULL; 
-}
-
-Cpu::Cpu(Model *model, const char *name, xbt_dict_t props,
-                int core, double powerPeak, double powerScale)
- : Resource(model, name, props)
- , m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
- , p_constraintCore(NULL)
- , p_constraintCoreId(NULL)
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host,
+    xbt_dynar_t speedPeakList, int core, double speedPeak)
+ : Cpu(model, host, NULL/*constraint*/, speedPeakList, core, speedPeak)
 {
-  surf_callback_emit(cpuCreatedCallbacks, this);
-  physCpu = NULL; 
 }
 
-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)
- , m_core(core)
- , m_powerPeak(powerPeak)
- , m_powerScale(powerScale)
+Cpu::Cpu(Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
+    xbt_dynar_t speedPeakList, int core, double speedPeak)
+ : Resource(model, host->name().c_str(), constraint)
+ , coresAmount_(core)
+ , host_(host)
 {
-  surf_callback_emit(cpuCreatedCallbacks, this);
-  /* At now, we assume that a VM does not have a multicore CPU. */
+  speed_.peak = speedPeak;
+  speed_.scale = 1;
+  host->pimpl_cpu = this;
+  xbt_assert(speed_.scale > 0, "Available speed has to be >0");
+
+  // Copy the power peak array:
+  speedPeakList_ = xbt_dynar_new(sizeof(double), nullptr);
+  unsigned long n = xbt_dynar_length(speedPeakList);
+  for (unsigned long i = 0; i != n; ++i) {
+    double value = xbt_dynar_get_as(speedPeakList, i, double);
+    xbt_dynar_push(speedPeakList_, &value);
+  }
+
+  /* Currently, 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);
+  p_constraintCore = xbt_new(lmm_constraint_t, core);
+  p_constraintCoreId = xbt_new(void*, core);
 
     int i;
     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_constraintCoreId[i] = bprintf("%s:%i", host->name().c_str(), i);
+      p_constraintCore[i] = lmm_constraint_new(model->getMaxminSystem(), p_constraintCoreId[i], speed_.scale * speed_.peak);
     }
   }
-  physCpu = NULL; 
 }
 
-Cpu::~Cpu(){
-  surf_callback_emit(cpuDestructedCallbacks, this);
+Cpu::~Cpu()
+{
   if (p_constraintCoreId){
-    for (int i = 0; i < m_core; i++) {
-         xbt_free(p_constraintCoreId[i]);
+    for (int i = 0; i < coresAmount_; i++) {
+    xbt_free(p_constraintCoreId[i]);
     }
     xbt_free(p_constraintCore);
   }
   if (p_constraintCoreId)
     xbt_free(p_constraintCoreId);
+  if (speedPeakList_)
+    xbt_dynar_free(&speedPeakList_);
 }
 
 double Cpu::getCurrentPowerPeak()
 {
-  return m_powerPeak;
+  return speed_.peak;
+}
+
+int Cpu::getNbPStates()
+{
+  return xbt_dynar_length(speedPeakList_);
+}
+
+void Cpu::setPState(int pstate_index)
+{
+  xbt_dynar_t plist = speedPeakList_;
+  xbt_assert(pstate_index <= (int)xbt_dynar_length(plist),
+      "Invalid parameters for CPU %s (pstate %d > length of pstates %d)", getName(), pstate_index, (int)xbt_dynar_length(plist));
+
+  double new_peak_speed = xbt_dynar_get_as(plist, pstate_index, double);
+  pstate_ = pstate_index;
+  speed_.peak = new_peak_speed;
+
+  onSpeedChange();
+}
+
+int Cpu::getPState()
+{
+  return pstate_;
+}
+
+double Cpu::getPowerPeakAt(int pstate_index)
+{
+  xbt_dynar_t plist = speedPeakList_;
+  xbt_assert((pstate_index <= (int)xbt_dynar_length(plist)), "Invalid parameters (pstate index out of bounds)");
+
+  return xbt_dynar_get_as(plist, pstate_index, double);
 }
 
 double Cpu::getSpeed(double load)
 {
-  return load * m_powerPeak;
+  return load * speed_.peak;
 }
 
 double Cpu::getAvailableSpeed()
 {
 /* number between 0 and 1 */
-  return m_powerScale;
+  return speed_.scale;
 }
 
-int Cpu::getCore()
-{
-  return m_core;
+void Cpu::onSpeedChange() {
+  TRACE_surf_host_set_speed(surf_get_clock(), getName(),
+      coresAmount_ * speed_.scale * speed_.peak);
 }
 
-void Cpu::setState(e_surf_resource_state_t state)
+
+int Cpu::getCore()
 {
-  e_surf_resource_state_t old = Resource::getState();
-  Resource::setState(state);
-  surf_callback_emit(cpuStateChangedCallbacks, this, old, state);
+  return coresAmount_;
 }
 
-void Cpu::setVirtual(Cpu *physCpu)
+void Cpu::setStateTrace(tmgr_trace_t trace)
 {
-  this->physCpu = physCpu;
-  XBT_DEBUG("The CPU is virtual so associate the cpu energy to the physical cpu instead of creating a new one");
-  std::map<Cpu*, CpuEnergy*>::iterator cpu_energy_it = surf_energy->find(physCpu);
-  xbt_assert(cpu_energy_it != surf_energy->end(), "The cpu is not in surf_energy.");
-  (*surf_energy)[this] = cpu_energy_it->second;
-}
+  xbt_assert(stateEvent_==NULL,"Cannot set a second state trace to Host %s", host_->name().c_str());
 
-Cpu* Cpu::isVirtual(void)
+  stateEvent_ = future_evt_set->add_trace(trace, 0.0, this);
+}
+void Cpu::setSpeedTrace(tmgr_trace_t trace)
 {
-   return physCpu;
+  xbt_assert(speed_.event==NULL,"Cannot set a second speed trace to Host %s", host_->name().c_str());
+
+  speed_.event = future_evt_set->add_trace(trace, 0.0, this);
 }
 
+
 /**********
  * Action *
  **********/
@@ -303,7 +322,7 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask)
     unsigned long nbits = 0;
 
     /* FIXME: There is much faster algorithms doing this. */
-    for (int i = 0; i < cpu->m_core; i++) {
+    for (int i = 0; i < cpu->coresAmount_; i++) {
       unsigned long has_affinity = (1UL << i) & mask;
       if (has_affinity)
         nbits += 1;
@@ -316,7 +335,7 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask)
     }
   }
 
-  for (int i = 0; i < cpu->m_core; i++) {
+  for (int i = 0; i < cpu->coresAmount_; i++) {
     XBT_DEBUG("clear affinity %p to cpu-%d@%s", this, i,  cpu->getName());
     lmm_shrink(cpu->getModel()->getMaxminSystem(), cpu->p_constraintCore[i], var_obj);
 
@@ -342,8 +361,13 @@ void CpuAction::setAffinity(Cpu *cpu, unsigned long mask)
   XBT_OUT();
 }
 
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> CpuAction::onStateChange;
+
 void CpuAction::setState(e_surf_action_state_t state){
-  e_surf_action_state_t old = getState();
+  e_surf_action_state_t previous = getState();
   Action::setState(state);
-  surf_callback_emit(cpuActionStateChangedCallbacks, this, old, state);
+  onStateChange(this, previous);
+}
+
+}
 }