* Trace *
*********/
-CpuTiTrace::CpuTiTrace(tmgr_trace_t power_trace)
+CpuTiTrace::CpuTiTrace(tmgr_trace_t speedTrace)
{
s_tmgr_event_t val;
unsigned int cpt;
double time = 0;
int i = 0;
p_timePoints = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->s_list.event_list) + 1));
+ (xbt_dynar_length(speedTrace->s_list.event_list) + 1));
p_integral = (double*) xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->s_list.event_list) + 1));
- m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list) + 1;
- xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
+ (xbt_dynar_length(speedTrace->s_list.event_list) + 1));
+ m_nbPoints = xbt_dynar_length(speedTrace->s_list.event_list) + 1;
+ xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) {
p_timePoints[i] = time;
p_integral[i] = integral;
integral += val.delta * val.value;
}
/**
-* \brief Auxiliary function to update the CPU power scale.
+* \brief Auxiliary function to update the CPU speed scale.
*
-* This function uses the trace structure to return the power scale at the determined time a.
-* \param trace Trace structure to search the updated power scale
+* This function uses the trace structure to return the speed scale at the determined time a.
+* \param trace Trace structure to search the updated speed scale
* \param a Time
-* \return CPU power scale
+* \return CPU speed scale
*/
double CpuTiTgmr::getPowerScale(double a)
{
reduced_a = a - floor(a / m_lastTime) * m_lastTime;
point = p_trace->binarySearch(p_trace->p_timePoints, reduced_a, 0,
p_trace->m_nbPoints - 1);
- xbt_dynar_get_cpy(p_powerTrace->s_list.event_list, point, &val);
+ xbt_dynar_get_cpy(p_speedTrace->s_list.event_list, point, &val);
return val.value;
}
/**
* \brief Creates a new integration trace from a tmgr_trace_t
*
-* \param power_trace CPU availability trace
-* \param value Percentage of CPU power available (useful to fixed tracing)
+* \param speedTrace CPU availability trace
+* \param value Percentage of CPU speed available (useful to fixed tracing)
* \param spacing Initial spacing
* \return Integration trace structure
*/
-CpuTiTgmr::CpuTiTgmr(tmgr_trace_t power_trace, double value)
+CpuTiTgmr::CpuTiTgmr(tmgr_trace_t speedTrace, double value)
{
double total_time = 0.0;
s_tmgr_event_t val;
p_trace = 0;
/* no availability file, fixed trace */
- if (!power_trace) {
+ if (!speedTrace) {
m_type = TRACE_FIXED;
m_value = value;
XBT_DEBUG("No availability trace. Constant value = %f", value);
}
/* only one point available, fixed trace */
- if (xbt_dynar_length(power_trace->s_list.event_list) == 1) {
- xbt_dynar_get_cpy(power_trace->s_list.event_list, 0, &val);
+ if (xbt_dynar_length(speedTrace->s_list.event_list) == 1) {
+ xbt_dynar_get_cpy(speedTrace->s_list.event_list, 0, &val);
m_type = TRACE_FIXED;
m_value = val.value;
return;
}
m_type = TRACE_DYNAMIC;
- p_powerTrace = power_trace;
+ p_speedTrace = speedTrace;
/* count the total time of trace file */
- xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
+ xbt_dynar_foreach(speedTrace->s_list.event_list, cpt, val) {
total_time += val.delta;
}
- p_trace = new CpuTiTrace(power_trace);
+ p_trace = new CpuTiTrace(speedTrace);
m_lastTime = total_time;
m_total = p_trace->integrateSimple(0, total_time);
static void cpu_ti_define_callbacks()
{
- sg_platf_host_add_cb(cpu_parse_init);
sg_platf_postparse_add_cb(cpu_add_traces);
}
cpu_ti_define_callbacks();
Model *model_pm = static_cast<Model*>(surf_cpu_model_pm);
Model *model_vm = static_cast<Model*>(surf_cpu_model_vm);
- xbt_dynar_push(model_list, &model_pm);
- xbt_dynar_push(model_list, &model_vm);
+ xbt_dynar_push(all_existing_models, &model_pm);
+ xbt_dynar_push(all_existing_models, &model_vm);
}
CpuTiModel::CpuTiModel() : CpuModel()
}
Cpu *CpuTiModel::createCpu(const char *name,
- xbt_dynar_t powerPeak,
+ xbt_dynar_t speedPeak,
int pstate,
- double powerScale,
- tmgr_trace_t powerTrace,
+ double speedScale,
+ tmgr_trace_t speedTrace,
int core,
e_surf_resource_state_t stateInitial,
tmgr_trace_t stateTrace,
{
xbt_assert(core==1,"Multi-core not handled with this model yet");
sg_host_t host = sg_host_by_name(name);
- xbt_assert(!sg_host_surfcpu(host),
- "Host '%s' declared several times in the platform file",
- name);
- xbt_assert(xbt_dynar_getfirst_as(powerPeak, double) > 0.0,
- "Power has to be >0.0. Did you forget to specify the mandatory power attribute?");
- CpuTi *cpu = new CpuTi(this, name, powerPeak, pstate, powerScale, powerTrace,
+ xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
+ "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?");
+ CpuTi *cpu = new CpuTi(this, name, speedPeak, pstate, speedScale, speedTrace,
core, stateInitial, stateTrace, cpuProperties);
- sg_host_surfcpu_set(host, cpu);
+ sg_host_surfcpu_register(host, cpu);
return cpu;
}
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- XBT_DEBUG("Add power trace: %s to CPU(%s)", trace_name, elm);
+ XBT_DEBUG("Add speed trace: %s to CPU(%s)", trace_name, elm);
if (cpu->p_availTrace)
delete cpu->p_availTrace;
- cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_powerScale);
+ cpu->p_availTrace = new CpuTiTgmr(trace, cpu->m_speedScale);
/* add a fake trace event if periodicity == 0 */
if (trace && xbt_dynar_length(trace->s_list.event_list) > 1) {
if (val.delta == 0) {
tmgr_trace_t empty_trace;
empty_trace = tmgr_empty_trace_new();
- cpu->p_powerEvent =
+ cpu->p_speedEvent =
tmgr_history_add_trace(history, empty_trace,
cpu->p_availTrace->m_lastTime, 0, cpu);
}
/************
* Resource *
************/
-CpuTi::CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t powerPeak,
- int pstate, double powerScale, tmgr_trace_t powerTrace, int core,
+CpuTi::CpuTi(CpuTiModel *model, const char *name, xbt_dynar_t speedPeak,
+ int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace,
- xbt_dict_t properties)
-: Cpu(model, name, properties, core, 0, powerScale)
+ xbt_dict_t properties)
+ : Cpu(model, name, properties, core, 0, speedScale, stateInitial)
{
- p_powerEvent = NULL;
- setState(stateInitial);
- m_powerScale = powerScale;
+ p_speedEvent = NULL;
+ m_speedScale = speedScale;
m_core = core;
tmgr_trace_t empty_trace;
s_tmgr_event_t val;
xbt_assert(core==1,"Multi-core not handled with this model yet");
- XBT_DEBUG("power scale %f", powerScale);
- p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
+ XBT_DEBUG("speed scale %f", speedScale);
+ p_availTrace = new CpuTiTgmr(speedTrace, speedScale);
p_actionSet = new ActionTiList();
m_lastUpdate = 0;
- xbt_dynar_get_cpy(powerPeak, 0, &m_powerPeak);
- xbt_dynar_free(&powerPeak); /* kill memory leak */
- XBT_DEBUG("CPU create: peak=%f", m_powerPeak);
+ xbt_dynar_get_cpy(speedPeak, 0, &m_speedPeak);
+ XBT_DEBUG("CPU create: peak=%f", m_speedPeak);
if (stateTrace)
p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
- if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) {
+ if (speedTrace && xbt_dynar_length(speedTrace->s_list.event_list) > 1) {
// add a fake trace event if periodicity == 0
- xbt_dynar_get_cpy(powerTrace->s_list.event_list,
- xbt_dynar_length(powerTrace->s_list.event_list) - 1, &val);
+ xbt_dynar_get_cpy(speedTrace->s_list.event_list,
+ xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
- p_powerEvent =
+ p_speedEvent =
tmgr_history_add_trace(history, empty_trace,
p_availTrace->m_lastTime, 0, this);
}
{
CpuTiAction *action;
- if (event_type == p_powerEvent) {
- tmgr_trace_t power_trace;
+ if (event_type == p_speedEvent) {
+ tmgr_trace_t speedTrace;
CpuTiTgmr *trace;
s_tmgr_event_t val;
modified(true);
- power_trace = p_availTrace->p_powerTrace;
- xbt_dynar_get_cpy(power_trace->s_list.event_list,
- xbt_dynar_length(power_trace->s_list.event_list) - 1, &val);
+ speedTrace = p_availTrace->p_speedTrace;
+ xbt_dynar_get_cpy(speedTrace->s_list.event_list,
+ xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
/* free old trace */
delete p_availTrace;
- m_powerScale = val.value;
+ m_speedScale = val.value;
trace = new CpuTiTgmr(TRACE_FIXED, val.value);
XBT_DEBUG("value %f", val.value);
p_availTrace = trace;
if (tmgr_trace_event_free(event_type))
- p_powerEvent = NULL;
+ p_speedEvent = NULL;
} else if (event_type == p_stateEvent) {
if (value > 0) {
(action->getRemains()) * sum_priority *
action->getPriority();
- total_area /= m_powerPeak;
+ total_area /= m_speedPeak;
action->setFinishTime(p_availTrace->solve(now, total_area));
/* verify which event will happen before (max_duration or finish time) */
double CpuTi::getAvailableSpeed()
{
- m_powerScale = p_availTrace->getPowerScale(surf_get_clock());
+ m_speedScale = p_availTrace->getPowerScale(surf_get_clock());
return Cpu::getAvailableSpeed();
}
return;
/* calcule the surface */
- area_total = p_availTrace->integrate(m_lastUpdate, now) * m_powerPeak;
+ area_total = p_availTrace->integrate(m_lastUpdate, now) * m_speedPeak;
XBT_DEBUG("Flops total: %f, Last update %f", area_total,
m_lastUpdate);
