#include "surf_private.h"
typedef s_surf_action_lmm_t s_surf_action_cpu_Cas01_t,
- *surf_action_cpu_Cas01_t;
+ *surf_action_cpu_Cas01_t;
typedef struct cpu_Cas01 {
s_surf_resource_t generic_resource;
double power_peak;
double power_scale;
+ int core;
tmgr_trace_event_t power_event;
e_surf_resource_state_t state_current;
tmgr_trace_event_t state_event;
lmm_system_t cpu_maxmin_system = NULL;
-static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = NULL;
+static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked =
+ NULL;
static cpu_Cas01_t cpu_new(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
+ int core,
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
{
cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name),
- "Host '%s' declared several times in the platform file", name);
+ "Host '%s' declared several times in the platform file",
+ name);
cpu->generic_resource.model = surf_cpu_model;
cpu->generic_resource.name = name;
cpu->generic_resource.properties = cpu_properties;
cpu->power_peak = power_peak;
xbt_assert0(cpu->power_peak > 0, "Power has to be >0");
cpu->power_scale = power_scale;
+ cpu->core = core;
+ xbt_assert1(core>0,"Invalid number of cores %d",core);
if (power_trace)
cpu->power_event =
- tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
+ tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
cpu->state_current = state_initial;
if (state_trace)
cpu->state_event =
- tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
+ tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
cpu->constraint =
- lmm_constraint_new(cpu_maxmin_system, cpu,
- cpu->power_scale * cpu->power_peak);
+ lmm_constraint_new(cpu_maxmin_system, cpu,
+ 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);
-#endif
return cpu;
}
{
double power_peak = 0.0;
double power_scale = 0.0;
+ int core = 0;
tmgr_trace_t power_trace = NULL;
e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF;
tmgr_trace_t state_trace = NULL;
power_peak = get_cpu_power(A_surfxml_host_power);
surf_parse_get_double(&power_scale, A_surfxml_host_availability);
power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
+ surf_parse_get_int(&core, A_surfxml_host_core);
xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
(A_surfxml_host_state == A_surfxml_host_state_OFF),
current_property_set = xbt_dict_new();
cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
- power_trace, state_initial, state_trace, current_property_set);
+ power_trace, core, state_initial, state_trace, current_property_set);
}
xbt_assert1(host, "Host %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
- host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host);
+ host->state_event =
+ tmgr_history_add_trace(history, trace, 0.0, 0, host);
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
xbt_assert1(host, "Host %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
- host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host);
+ host->power_event =
+ tmgr_history_add_trace(history, trace, 0.0, 0, host);
}
}
static void cpu_define_callbacks(const char *file)
{
- surf_parse_reset_parser();
surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
}
lmm_variable_free(cpu_maxmin_system,
((surf_action_cpu_Cas01_t) action)->variable);
#ifdef HAVE_TRACING
- if (action->category) xbt_free (action->category);
+ if (action->category)
+ xbt_free(action->category);
#endif
- free(action);
+ surf_action_free(&action);
return 1;
}
return 0;
xbt_swag_foreach_safe(action, next_action, running_actions) {
#ifdef HAVE_TRACING
- cpu_Cas01_t x = lmm_constraint_id(lmm_get_cnst_from_var (cpu_maxmin_system, action->variable, 0));
-
- TRACE_surf_host_set_utilization (x->generic_resource.name,
- action->generic_action.data, (surf_action_t)action, lmm_variable_getvalue(action->variable), now-delta, delta);
+ cpu_Cas01_t x =
+ lmm_constraint_id(lmm_get_cnst_from_var
+ (cpu_maxmin_system, action->variable, 0));
+
+ TRACE_surf_host_set_utilization(x->generic_resource.name,
+ action->generic_action.data,
+ (surf_action_t) action,
+ lmm_variable_getvalue
+ (action->variable), now - delta,
+ delta);
+ TRACE_last_timestamp_to_dump = now-delta;
#endif
double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * delta);
}
static void cpu_update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value, double date)
+ tmgr_trace_event_t event_type,
+ 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);
+ TRACE_surf_host_set_power(date, cpu->generic_resource.name,
+ 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) {
if (surf_action_state_get(action) == SURF_ACTION_RUNNING ||
surf_action_state_get(action) == SURF_ACTION_READY ||
- surf_action_state_get(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+ surf_action_state_get(action) ==
+ SURF_ACTION_NOT_IN_THE_SYSTEM) {
action->finish = date;
cpu_action_state_set(action, SURF_ACTION_FAILED);
}
if (tmgr_trace_event_free(event_type))
cpu->state_event = NULL;
} else {
- CRITICAL0("Unknown event ! \n");
+ XBT_CRITICAL("Unknown event ! \n");
xbt_abort();
}
surf_action_cpu_Cas01_t action = NULL;
cpu_Cas01_t CPU = cpu;
- XBT_IN2("(%s,%g)", surf_resource_name(CPU), size);
+ XBT_IN("(%s,%g)", surf_resource_name(CPU), size);
action =
- surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, surf_cpu_model,
- CPU->state_current != SURF_RESOURCE_ON);
+ surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size,
+ surf_cpu_model,
+ CPU->state_current != SURF_RESOURCE_ON);
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
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;
+ XBT_OUT();
return (surf_action_t) action;
}
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
+ XBT_IN("(%s,%g)", surf_resource_name(cpu), duration);
action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
is used to speed up update_resource_state */
xbt_swag_remove(action, ((surf_action_t) action)->state_set);
((surf_action_t) action)->state_set =
- cpu_running_action_set_that_does_not_need_being_checked;
+ cpu_running_action_set_that_does_not_need_being_checked;
xbt_swag_insert(action, ((surf_action_t) action)->state_set);
}
lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0);
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
static void cpu_action_suspend(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_cpu_Cas01_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable,
- 0.0);
+ ((surf_action_cpu_Cas01_t)
+ action)->variable, 0.0);
((surf_action_cpu_Cas01_t) action)->suspended = 1;
}
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_action_resume(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
if (((surf_action_cpu_Cas01_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable,
- action->priority);
+ ((surf_action_cpu_Cas01_t)
+ action)->variable, action->priority);
((surf_action_cpu_Cas01_t) action)->suspended = 0;
}
- XBT_OUT;
+ XBT_OUT();
}
static int cpu_action_is_suspended(surf_action_t action)
return (((surf_action_cpu_Cas01_t) action)->suspended == 1);
}
-static void cpu_action_set_max_duration(surf_action_t action, double duration)
+static void cpu_action_set_max_duration(surf_action_t action,
+ double duration)
{
- XBT_IN2("(%p,%g)", action, duration);
+ XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
- XBT_OUT;
+ XBT_OUT();
}
static void cpu_action_set_priority(surf_action_t action, double priority)
{
- XBT_IN2("(%p,%g)", action, priority);
+ XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
lmm_update_variable_weight(cpu_maxmin_system,
((surf_action_cpu_Cas01_t) action)->variable,
priority);
- XBT_OUT;
+ XBT_OUT();
}
+#ifdef HAVE_TRACING
+static void cpu_action_set_category(surf_action_t action, const char *category)
+{
+ XBT_IN("(%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);
+ XBT_IN("(%p)", action);
return action->remains;
- XBT_OUT;
+ XBT_OUT();
}
static e_surf_resource_state_t cpu_get_state(void *cpu)
}
static void cpu_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
+ double power_scale,
+ tmgr_trace_t power_trace,
+ int core,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties)
{
- cpu_new(name,power_peak,power_scale,power_trace,
- state_initial,state_trace,cpu_properties);
+ cpu_new(name, power_peak, power_scale, power_trace, core,
+ state_initial, state_trace, cpu_properties);
}
static void cpu_finalize(void)
surf_cpu_model = surf_model_init();
cpu_running_action_set_that_does_not_need_being_checked =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
+ xbt_swag_new(xbt_swag_offset(action, state_hookup));
surf_cpu_model->name = "CPU";
surf_cpu_model->model_private->resource_used = cpu_resource_used;
surf_cpu_model->model_private->share_resources = cpu_share_resources;
- surf_cpu_model->model_private->update_actions_state = cpu_update_actions_state;
+ surf_cpu_model->model_private->update_actions_state =
+ cpu_update_actions_state;
surf_cpu_model->model_private->update_resource_state =
- cpu_update_resource_state;
+ cpu_update_resource_state;
surf_cpu_model->model_private->finalize = cpu_finalize;
surf_cpu_model->suspend = cpu_action_suspend;
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;
surf_cpu_model->extension.cpu.get_state = cpu_get_state;
surf_cpu_model->extension.cpu.get_speed = cpu_get_speed;
- surf_cpu_model->extension.cpu.get_available_speed = cpu_get_available_speed;
+ surf_cpu_model->extension.cpu.get_available_speed =
+ cpu_get_available_speed;
surf_cpu_model->extension.cpu.create_resource = cpu_create_resource;
surf_cpu_model->extension.cpu.add_traces = add_traces_cpu;
