/* 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 "surf_interface.hpp"
-#include "maxmin_private.hpp"
-
#ifndef SURF_CPU_INTERFACE_HPP_
#define SURF_CPU_INTERFACE_HPP_
+#include "simgrid/s4u/host.hpp"
+#include "src/surf/maxmin_private.hpp"
+
/***********
* Classes *
***********/
class CpuModel;
class Cpu;
class CpuAction;
-class CpuPlugin;
-
-/*************
- * Callbacks *
- *************/
-XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
-
-/*********
- * Model *
- *********/
/** @ingroup SURF_cpu_interface
* @brief SURF cpu model interface class
*/
XBT_PUBLIC_CLASS CpuModel : public Model {
public:
- CpuModel() : Model() {};
-
/**
* @brief Create a Cpu
*
* @param host The host that will have this CPU
- * @param speedPeak The peak spead (max speed in Flops)
- * @param pstate [TODO]
- * @param speedScale The speed scale (in [O;1] available speed from peak)
- * @param speedTrace Trace variations
+ * @param speedPerPstate Processor speed (in Flops) of each pstate. This ignores any potential external load coming from a trace.
* @param core The number of core of this Cpu
- * @param initiallyOn [TODO]
- * @param state_trace [TODO]
*/
- virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale,
- tmgr_trace_t speedTrace, int core,
- int initiallyOn,
- tmgr_trace_t state_trace)=0;
-
- void updateActionsStateLazy(double now, double delta);
- void updateActionsStateFull(double now, double delta);
- bool next_occuring_event_isIdempotent() {return true;}
+ virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)=0;
+
+ void updateActionsStateLazy(double now, double delta) override;
+ void updateActionsStateFull(double now, double delta) override;
};
/************
* @param model The CpuModel associated to this Cpu
* @param host The host in which this Cpu should be plugged
* @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
- * @param speedPeakList [TODO]
- * @param pstate [TODO]
+ * @param speedPerPstate Processor speed (in flop per second) for each pstate
* @param core The number of core of this Cpu
- * @param speedPeak The speed peak of this Cpu in flops (max speed)
- * @param speedScale The speed scale of this Cpu in [0;1] (available amount)
- * @param initiallyOn whether it is created running or crashed
*/
- Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
- lmm_constraint_t constraint,
- xbt_dynar_t speedPeakList, int pstate,
- int core, double speedPeak, double speedScale,
- int initiallyOn);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
+ std::vector<double> *speedPerPstate, int core);
/**
* @brief Cpu constructor
*
* @param model The CpuModel associated to this Cpu
* @param host The host in which this Cpu should be plugged
- * @param speedPeakList [TODO]
- * @param pstate
+ * @param speedPerPstate Processor speed (in flop per second) for each pstate
* @param core The number of core of this Cpu
- * @param speedPeak The speed peak of this Cpu in flops (max speed)
- * @param speedScale The speed scale of this Cpu in [0;1] (available amount)
- * @param initiallyOn whether it is created running or crashed
*/
- Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host,
- xbt_dynar_t speedPeakList, int pstate,
- int core, double speedPeak, double speedScale,
- int initiallyOn);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
~Cpu();
virtual simgrid::surf::Action *sleep(double duration)=0;
/** @brief Get the amount of cores */
- virtual int getCore();
+ virtual int coreCount();
/** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
virtual double getSpeed(double load);
/** @brief Get the available speed of the current Cpu */
virtual double getAvailableSpeed();
- /** @brief Get the current Cpu power peak */
- virtual double getCurrentPowerPeak();
-
- virtual double getPowerPeakAt(int pstate_index);
+ /** @brief Get the current Cpu computational speed */
+ virtual double getPstateSpeedCurrent();
+ virtual double getPstateSpeed(int pstate_index);
virtual int getNbPStates();
virtual void setPState(int pstate_index);
virtual int getPState();
- simgrid::s4u::Host* getHost() { return m_host; }
+ simgrid::s4u::Host* getHost() { return host_; }
public:
- int m_core = 1; /* Amount of cores */
- simgrid::s4u::Host* m_host;
+ int coresAmount_ = 1;
+ simgrid::s4u::Host* host_;
- xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
- int m_pstate = 0; /*< Current pstate (index in the speedPeakList)*/
-
- /* Note (hypervisor): */
- lmm_constraint_t *p_constraintCore=NULL;
- void **p_constraintCoreId=NULL;
+ std::vector<double> speedPerPstate_; /*< List of supported CPU capacities (pstate related) */
+ int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/
public:
- virtual void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */
- virtual void set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */
+ virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */
+ virtual void setSpeedTrace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */
- tmgr_trace_iterator_t p_stateEvent = nullptr;
- s_surf_metric_t p_speed = {1.0, 0, nullptr};
+ tmgr_trace_iterator_t stateEvent_ = nullptr;
+ s_surf_metric_t speed_ = {1.0, 0, nullptr};
};
/**********
**********/
/** @ingroup SURF_cpu_interface
- * @brief SURF Cpu action interface class
- * @details A CpuAction represent the execution of code on a Cpu
+ * @brief A CpuAction represents the execution of code on one or several Cpus
*/
XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
-/** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
- * @details Callback functions have the following signature: `void(CpuAction *action, e_surf_action_state_t previous)`
+/** @brief Signal emitted when the action state changes (ready/running/done, etc)
+ * Signature: `void(CpuAction *action, simgrid::surf::Action::State previous)`
+ */
+static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::surf::Action::State)> onStateChange;
+/** @brief Signal emitted when the action share changes (amount of flops it gets)
+ * Signature: `void(CpuAction *action)`
*/
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> onStateChange;
+static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> onShareChange;
- /** @brief CpuAction constructor */
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
- : Action(model, cost, failed) {} //FIXME:DEADCODE?
-
- /** @brief CpuAction constructor */
+ : Action(model, cost, failed) {}
CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
- : Action(model, cost, failed, var) {}
-
- /**
- * @brief Set the affinity of the current CpuAction
- * @details [TODO]
- */
- virtual void setAffinity(Cpu *cpu, unsigned long mask);
-
- void setState(e_surf_action_state_t state);
+ : Action(model, cost, failed, var) {}
- void updateRemainingLazy(double now);
+ void setState(simgrid::surf::Action::State state) override;
+ void updateRemainingLazy(double now) override;
+ std::list<Cpu*> cpus();
};
}
