* @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 speedPeak The peak spead (max speed in Flops when no external load comes from a trace)
* @param speedTrace Trace variations
* @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 shareResourcesIsIdempotent() {return true;}
+ bool next_occuring_event_isIdempotent() {return true;}
};
/************
* @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 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);
+ lmm_constraint_t constraint, xbt_dynar_t speedPeakList, int core, double speedPeak);
/**
* @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 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);
+ xbt_dynar_t speedPeakList, int core, double speedPeak);
~Cpu();
public:
int m_core = 1; /* Amount of cores */
- double m_speedPeak; /*< CPU speed peak, ie max value */
- double m_speedScale; /*< Percentage of CPU available according to the trace, in [O,1] */
simgrid::s4u::Host* m_host;
xbt_dynar_t p_speedPeakList = NULL; /*< List of supported CPU capacities (pstate related) */
void **p_constraintCoreId=NULL;
public:
- void set_state_trace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF) */
- void set_speed_trace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load) */
-protected:
+ 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) */
+
tmgr_trace_iterator_t p_stateEvent = nullptr;
- tmgr_trace_iterator_t p_speedEvent = nullptr;
+ s_surf_metric_t p_speed = {1.0, 0, nullptr};
};
/**********