}
Cpu *CpuCas01Model::createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale,
+ int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
tmgr_trace_t state_trace)
return cpu;
}
-double CpuCas01Model::shareResourcesFull(double /*now*/)
+double CpuCas01Model::next_occuring_event_full(double /*now*/)
{
- return Model::shareResourcesMaxMin(getRunningActionSet(),
- p_maxminSystem, lmm_solve);
+ return Model::shareResourcesMaxMin(getRunningActionSet(), p_maxminSystem, lmm_solve);
}
void CpuCas01Model::addTraces()
return;
called = 1;
- /* connect all traces relative to hosts */
- xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
+ /* connect host speed traces */
+ xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuCas01 *host = static_cast<CpuCas01*>(sg_host_by_name(elm)->pimpl_cpu);
+ Cpu *cpu = sg_host_by_name(elm)->pimpl_cpu;
- xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, host);
- }
-
- xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
- tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
- CpuCas01 *host = static_cast<CpuCas01*>(sg_host_by_name(elm)->pimpl_cpu);
-
- xbt_assert(host, "Host %s undefined", elm);
- xbt_assert(trace, "Trace %s undefined", trace_name);
-
- host->p_speedEvent = future_evt_set->add_trace(trace, 0.0, host);
+ cpu->set_speed_trace(trace);
}
}
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace)
: Cpu(model, host,
- lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)),
- speedPeak, pstate,
- core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
+ lmm_constraint_new(model->getMaxminSystem(), this, core * speedScale * xbt_dynar_get_as(speedPeak, pstate, double)),
+ speedPeak, pstate,
+ core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
initiallyOn) {
XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate);
/** @brief take into account changes of speed (either load or max) */
void CpuCas01::onSpeedChange() {
- lmm_variable_t var = NULL;
- lmm_element_t elem = NULL;
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(),
m_core * m_speedScale * m_speedPeak);
m_speedScale * m_speedPeak);
}
- Cpu::onSpeedChange();
+ Cpu::onSpeedChange();
}
-void CpuCas01::updateState(tmgr_trace_iterator_t event_type, double value, double date)
+void CpuCas01::apply_event(tmgr_trace_iterator_t event_type, double value)
{
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
turnOn();
} else {
lmm_constraint_t cnst = getConstraint();
+ double date = surf_get_clock();
turnOff();
CpuCas01Action::CpuCas01Action(Model *model, double cost, bool failed, double speed, lmm_constraint_t constraint)
: CpuAction(model, cost, failed,
- lmm_variable_new(model->getMaxminSystem(), this,
- 1.0, speed, 1))
+ lmm_variable_new(model->getMaxminSystem(), this,
+ 1.0, speed, 1))
{
if (model->getUpdateMechanism() == UM_LAZY) {
m_indexHeap = -1;