-/* Copyright (c) 2013-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2019. 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 "xbt/base.h"
/***********
* Classes *
***********/
-class CpuCas01Model;
-typedef CpuCas01Model *CpuCas01ModelPtr;
-class CpuCas01;
-typedef CpuCas01 *CpuCas01Ptr;
+namespace simgrid {
+namespace surf {
-class CpuCas01Action;
-typedef CpuCas01Action *CpuCas01ActionPtr;
+class XBT_PRIVATE CpuCas01Model;
+class XBT_PRIVATE CpuCas01;
+class XBT_PRIVATE CpuCas01Action;
/*********
* Model *
*********/
-class CpuCas01Model : public CpuModel {
+
+class CpuCas01Model : public kernel::resource::CpuModel {
public:
- CpuCas01Model();
- ~CpuCas01Model();
-
- double (CpuCas01Model::*shareResources)(double now);
- void (CpuCas01Model::*updateActionsState)(double now, double delta);
-
- CpuPtr createCpu(const char *name, xbt_dynar_t power_peak, int pstate,
- double power_scale,
- tmgr_trace_t power_trace, int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties);
- double shareResourcesFull(double now);
- void addTraces();
- ActionListPtr p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
+ CpuCas01Model(const CpuCas01Model&) = delete;
+ CpuCas01Model& operator=(const CpuCas01Model&) = delete;
+ ~CpuCas01Model() override;
+
+ kernel::resource::Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
};
/************
* Resource *
************/
-class CpuCas01 : public Cpu {
+class CpuCas01 : public kernel::resource::Cpu {
public:
- CpuCas01(CpuCas01ModelPtr model, const char *name, xbt_dynar_t power_peak,
- int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
- e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
- xbt_dict_t properties) ;
- ~CpuCas01();
- void updateState(tmgr_trace_event_t event_type, double value, double date);
- CpuActionPtr execute(double size);
- CpuActionPtr sleep(double duration);
-
- double getCurrentPowerPeak();
- double getPowerPeakAt(int pstate_index);
- int getNbPstates();
- void setPowerPeakAt(int pstate_index);
- bool isUsed();
- void setStateEvent(tmgr_trace_event_t stateEvent);
- void setPowerEvent(tmgr_trace_event_t stateEvent);
- xbt_dynar_t getPowerPeakList();
-
- int getPState();
+ CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+ CpuCas01(const CpuCas01&) = delete;
+ CpuCas01& operator=(const CpuCas01&) = delete;
+ ~CpuCas01() override;
+ void apply_event(simgrid::kernel::profile::Event* event, double value) override;
+ kernel::resource::CpuAction* execution_start(double size) override;
+ kernel::resource::CpuAction* execution_start(double size, int requested_cores) override;
+ kernel::resource::CpuAction* sleep(double duration) override;
-private:
- tmgr_trace_event_t p_stateEvent;
- tmgr_trace_event_t p_powerEvent;
- xbt_dynar_t p_powerPeakList; /*< List of supported CPU capacities */
- int m_pstate; /*< Current pstate (index in the power_peak_list)*/
+ bool is_used() override;
+
+protected:
+ void on_speed_change() override;
};
/**********
* Action *
**********/
-class CpuCas01Action: public CpuAction {
- friend CpuActionPtr CpuCas01::execute(double size);
- friend CpuActionPtr CpuCas01::sleep(double duration);
+class CpuCas01Action : public kernel::resource::CpuAction {
+ friend kernel::resource::CpuAction* CpuCas01::execution_start(double size);
+ friend kernel::resource::CpuAction* CpuCas01::sleep(double duration);
+
public:
- CpuCas01Action(ModelPtr model, double cost, bool failed, double power, lmm_constraint_t constraint);
+ CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint, int core_count);
+ CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint);
+ CpuCas01Action(const CpuCas01Action&) = delete;
+ CpuCas01Action& operator=(const CpuCas01Action&) = delete;
+ ~CpuCas01Action() override;
+ int requested_core();
- ~CpuCas01Action() {};
+private:
+ int requested_core_ = 1;
};
+
+}
+}
