#include "surf_private.h"
-typedef s_surf_action_lmm_t s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t;
+typedef s_surf_action_lmm_t s_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;
- double power_current;
tmgr_trace_event_t power_event;
e_surf_resource_state_t state_current;
tmgr_trace_event_t state_event;
static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL;
-static cpu_Cas01_t cpu_new(char *name, double power_scale,
- double power_initial,
+static cpu_Cas01_t cpu_new(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,
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;
- xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
- cpu->power_current = power_initial;
if (power_trace)
cpu->power_event =
tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu);
cpu->constraint =
lmm_constraint_new(cpu_maxmin_system, cpu,
- cpu->power_current * cpu->power_scale);
+ cpu->power_scale * cpu->power_peak);
- xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free);
+ xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
+ surf_resource_free);
return cpu;
}
static void parse_cpu_init(void)
{
+ double power_peak = 0.0;
double power_scale = 0.0;
- double power_initial = 0.0;
tmgr_trace_t power_trace = NULL;
e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF;
tmgr_trace_t state_trace = NULL;
- power_scale = get_cpu_power(A_surfxml_host_power);
- surf_parse_get_double(&power_initial, A_surfxml_host_availability);
+ 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);
xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
current_property_set = xbt_dict_new();
- cpu_new(xbt_strdup(A_surfxml_host_id), power_scale, power_initial,
+ cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
power_trace, state_initial, state_trace, current_property_set);
}
{
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);
}
static int resource_used(void *resource_id)
}
static void cpu_action_state_set(surf_action_t action,
- e_surf_action_state_t state)
+ e_surf_action_state_t state)
{
/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
/* if(((surf_action_cpu_Cas01_t)action)->variable) { */
static double share_resources(double now)
{
s_surf_action_cpu_Cas01_t action;
- return generic_maxmin_share_resources(surf_cpu_model->states.
- running_action_set,
+ return generic_maxmin_share_resources(surf_cpu_model->
+ states.running_action_set,
xbt_swag_offset(action, variable),
cpu_maxmin_system, lmm_solve);
}
cpu_Cas01_t cpu = id;
if (event_type == cpu->power_event) {
- cpu->power_current = value;
+ cpu->power_scale = value;
lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
- cpu->power_current * cpu->power_scale);
+ 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 (value > 0)
cpu->state_current = SURF_RESOURCE_ON;
}
}
}
+ if (tmgr_trace_event_free(event_type))
+ cpu->state_event = NULL;
} else {
CRITICAL0("Unknown event ! \n");
xbt_abort();
surf_action_cpu_Cas01_t action = NULL;
cpu_Cas01_t CPU = cpu;
- XBT_IN2("(%s,%g)", CPU->generic_resource.name, size);
- action = surf_action_new(sizeof(s_surf_action_cpu_Cas01_t),size,surf_cpu_model,
- CPU->state_current != SURF_RESOURCE_ON);
+ XBT_IN2("(%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);
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->generic_resource.name, duration);
+ XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
XBT_OUT;
}
+static double action_get_remains(surf_action_t action)
+{
+ XBT_IN1("(%p)", action);
+ return action->remains;
+ XBT_OUT;
+}
+
static e_surf_resource_state_t get_state(void *cpu)
{
return ((cpu_Cas01_t) cpu)->state_current;
static double get_speed(void *cpu, double load)
{
- return load * (((cpu_Cas01_t) cpu)->power_scale);
+ return load * (((cpu_Cas01_t) cpu)->power_peak);
}
static double get_available_speed(void *cpu)
{
/* number between 0 and 1 */
- return ((cpu_Cas01_t) cpu)->power_current;
+ return ((cpu_Cas01_t) cpu)->power_scale;
}
static void finalize(void)
surf_cpu_model->is_suspended = action_is_suspended;
surf_cpu_model->set_max_duration = action_set_max_duration;
surf_cpu_model->set_priority = action_set_priority;
+ surf_cpu_model->get_remains = action_get_remains;
+
surf_cpu_model->extension.cpu.execute = execute;
surf_cpu_model->extension.cpu.sleep = action_sleep;