cpu->constraint =
lmm_constraint_new(cpu_maxmin_system, cpu,
- cpu->power_scale * cpu->power_peak);
+ cpu->core * cpu->power_scale * cpu->power_peak);
xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
surf_resource_free);
#ifdef HAVE_TRACING
- TRACE_surf_host_declaration(name, cpu->power_scale * cpu->power_peak);
+ TRACE_surf_host_declaration(name, cpu->core * cpu->power_scale * cpu->power_peak);
#endif
return cpu;
double value, double date)
{
cpu_Cas01_t cpu = id;
+ lmm_variable_t var = NULL;
+ lmm_element_t elem = NULL;
if (event_type == cpu->power_event) {
cpu->power_scale = value;
lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
- cpu->power_scale * cpu->power_peak);
+ cpu->core * cpu->power_scale * cpu->power_peak);
#ifdef HAVE_TRACING
TRACE_surf_host_set_power(date, cpu->generic_resource.name,
- cpu->power_scale * cpu->power_peak);
+ cpu->core * cpu->power_scale * cpu->power_peak);
#endif
+ while ((var = lmm_get_var_from_cnst
+ (cpu_maxmin_system, cpu->constraint, &elem))) {
+ surf_action_cpu_Cas01_t action = lmm_variable_id(var);
+ lmm_update_variable_bound(cpu_maxmin_system, action->variable,
+ cpu->power_scale * cpu->power_peak);
+ }
if (tmgr_trace_event_free(event_type))
cpu->power_event = NULL;
} else if (event_type == cpu->state_event) {
action->variable = lmm_variable_new(cpu_maxmin_system, action,
action->generic_action.priority,
- -1.0, 1);
+ CPU->power_scale * CPU->power_peak, 1);
lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0);
XBT_OUT;
return (surf_action_t) action;
XBT_OUT;
}
+#ifdef HAVE_TRACING
+static void cpu_action_set_category(surf_action_t action, const char *category)
+{
+ XBT_IN2("(%p,%s)", action, category);
+ action->category = xbt_strdup (category);
+ XBT_OUT;
+}
+#endif
+
static double cpu_action_get_remains(surf_action_t action)
{
XBT_IN1("(%p)", action);
surf_cpu_model->is_suspended = cpu_action_is_suspended;
surf_cpu_model->set_max_duration = cpu_action_set_max_duration;
surf_cpu_model->set_priority = cpu_action_set_priority;
+#ifdef HAVE_TRACING
+ surf_cpu_model->set_category = cpu_action_set_category;
+#endif
surf_cpu_model->get_remains = cpu_action_get_remains;
surf_cpu_model->extension.cpu.execute = cpu_execute;