double power_peak;
double power_scale;
tmgr_trace_event_t power_event;
+ int core;
e_surf_resource_state_t state_current;
tmgr_trace_event_t state_event;
lmm_constraint_t constraint;
extern int sg_maxmin_selective_update;
-static xbt_swag_t cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
+static xbt_swag_t
+ cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
static cpu_Cas01_im_t cpu_im_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,
- 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_Cas01_im_t cpu = NULL;
s_surf_action_cpu_Cas01_im_t action;
cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
- #ifdef HAVE_TRACING
- TRACE_surf_host_declaration (name, power_scale * power_peak);
- #endif
-
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_scale = power_scale;
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->core = core;
+ xbt_assert1(core>0,"Invalid number of cores %d",core);
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_im_maxmin_system, cpu,
- cpu->power_scale * cpu->power_peak);
+ lmm_constraint_new(cpu_im_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);
{
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_im_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_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
-
static int called = 0;
-
if (called)
return;
called = 1;
-
/* connect all traces relative to hosts */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
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);
}
}
surf_parse_reset_parser();
surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &cpu_im_add_traces_cpu);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list,
+ &cpu_im_add_traces_cpu);
}
static int cpu_im_resource_used(void *resource_id)
xbt_swag_remove(action,
((cpu_Cas01_im_t) ACTION_GET_CPU(action))->action_set);
xbt_swag_insert(ACTION_GET_CPU(action), cpu_im_modified_cpu);
+#ifdef HAVE_TRACING
+ if (action->category)
+ xbt_free(action->category);
+#endif
free(action);
return 1;
}
}
static void cpu_im_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_lmm_t)action)->variable) { */
(action).variable) * (now -
cpu->last_update));
#ifdef HAVE_TRACING
- TRACE_surf_host_set_utilization (cpu->generic_resource.name,
- action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), cpu->last_update, now-cpu->last_update);
+ TRACE_surf_host_set_utilization(cpu->generic_resource.name,
+ action->
+ generic_lmm_action.generic_action.
+ data, (surf_action_t) action,
+ lmm_variable_getvalue
+ (GENERIC_LMM_ACTION
+ (action).variable),
+ cpu->last_update,
+ now - cpu->last_update);
#endif
DEBUG2("Update action(%p) remains %lf", action,
GENERIC_ACTION(action).remains);
cpu_Cas01_im_t cpu, cpu_next;
xbt_swag_foreach(cpu, cpu_im_modified_cpu)
- cpu_im_update_remains(cpu, now);
+ cpu_im_update_remains(cpu, now);
lmm_solve(cpu_im_maxmin_system);
min = -1;
value = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
if (value > 0) {
- if (GENERIC_ACTION(action).remains > 0)
+ if (GENERIC_ACTION(action).remains > 0) {
value = GENERIC_ACTION(action).remains / value;
- else
+ min = now + value;
+ } else {
value = 0.0;
+ min = now;
+ }
}
- if (value > 0)
- min = now + value;
if ((GENERIC_ACTION(action).max_duration != NO_MAX_DURATION)
&& (min == -1
|| GENERIC_ACTION(action).start +
GENERIC_ACTION(action).max_duration < min))
min =
- GENERIC_ACTION(action).start + GENERIC_ACTION(action).max_duration;
+ GENERIC_ACTION(action).start +
+ GENERIC_ACTION(action).max_duration;
DEBUG4("Action(%p) Start %lf Finish %lf Max_duration %lf", action,
GENERIC_ACTION(action).start, now + value,
if (action->index_heap >= 0) {
surf_action_cpu_Cas01_im_t heap_act =
- xbt_heap_remove(cpu_im_action_heap, action->index_heap);
+ xbt_heap_remove(cpu_im_action_heap, action->index_heap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
xbt_swag_remove(cpu, cpu_im_modified_cpu);
}
return xbt_heap_size(cpu_im_action_heap) >
- 0 ? xbt_heap_maxkey(cpu_im_action_heap) - now : -1;
+ 0 ? xbt_heap_maxkey(cpu_im_action_heap) - now : -1;
}
static void cpu_im_update_actions_state(double now, double delta)
GENERIC_ACTION(action).finish = surf_get_clock();
/* set the remains to 0 due to precision problems when updating the remaining amount */
#ifdef HAVE_TRACING
- TRACE_surf_host_set_utilization (((cpu_Cas01_im_t)(action->cpu))->generic_resource.name,
- action->generic_lmm_action.generic_action.data, lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable), ((cpu_Cas01_im_t)(action->cpu))->last_update, now-((cpu_Cas01_im_t)(action->cpu))->last_update);
+ TRACE_surf_host_set_utilization(((cpu_Cas01_im_t)
+ (action->cpu))->generic_resource.name,
+ action->
+ generic_lmm_action.generic_action.data,
+ (surf_action_t) action,
+ lmm_variable_getvalue
+ (GENERIC_LMM_ACTION(action).variable),
+ ((cpu_Cas01_im_t)
+ (action->cpu))->last_update,
+ now -
+ ((cpu_Cas01_im_t)
+ (action->cpu))->last_update);
#endif
GENERIC_ACTION(action).remains = 0;
cpu_im_cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
}
static void cpu_im_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_im_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_im_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_im_maxmin_system, cpu->constraint, &elem))) {
+ surf_action_cpu_Cas01_im_t action = lmm_variable_id(var);
+ lmm_update_variable_bound(cpu_im_maxmin_system, action->generic_lmm_action.variable,
+ cpu->power_scale * cpu->power_peak);
+ }
xbt_swag_insert(cpu, cpu_im_modified_cpu);
if (tmgr_trace_event_free(event_type))
cpu->power_event = NULL;
cpu->state_current = SURF_RESOURCE_OFF;
- while ((var = lmm_get_var_from_cnst(cpu_im_maxmin_system, cnst, &elem))) {
+ while ((var =
+ lmm_get_var_from_cnst(cpu_im_maxmin_system, cnst, &elem))) {
surf_action_t action = lmm_variable_id(var);
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_im_cpu_action_state_set(action, SURF_ACTION_FAILED);
}
XBT_IN2("(%s,%g)", surf_resource_name(CPU), size);
action =
- surf_action_new(sizeof(s_surf_action_cpu_Cas01_im_t), size,
- surf_cpu_model, CPU->state_current != SURF_RESOURCE_ON);
+ surf_action_new(sizeof(s_surf_action_cpu_Cas01_im_t), size,
+ surf_cpu_model,
+ CPU->state_current != SURF_RESOURCE_ON);
GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
GENERIC_LMM_ACTION(action).variable =
- lmm_variable_new(cpu_im_maxmin_system, action,
- GENERIC_ACTION(action).priority, -1.0, 1);
+ lmm_variable_new(cpu_im_maxmin_system, action,
+ GENERIC_ACTION(action).priority, CPU->power_scale * CPU->power_peak, 1);
action->index_heap = -1;
action->cpu = CPU;
xbt_swag_insert(CPU, cpu_im_modified_cpu);
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_im_running_action_set_that_does_not_need_being_checked;
+ cpu_im_running_action_set_that_does_not_need_being_checked;
xbt_swag_insert(action, ((surf_action_t) action)->state_set);
}
XBT_IN1("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_im_maxmin_system,
- ((surf_action_lmm_t) action)->variable, 0.0);
+ ((surf_action_lmm_t) action)->variable,
+ 0.0);
((surf_action_lmm_t) action)->suspended = 1;
xbt_heap_remove(cpu_im_action_heap,
((surf_action_cpu_Cas01_im_t) action)->index_heap);
return (((surf_action_lmm_t) action)->suspended == 1);
}
-static void cpu_im_action_set_max_duration(surf_action_t action, double duration)
+static void cpu_im_action_set_max_duration(surf_action_t action,
+ double duration)
{
XBT_IN2("(%p,%g)", action, duration);
XBT_OUT;
}
-static void cpu_im_action_set_priority(surf_action_t action, double priority)
+static void cpu_im_action_set_priority(surf_action_t action,
+ double priority)
{
XBT_IN2("(%p,%g)", action, priority);
action->priority = priority;
XBT_OUT;
}
+#ifdef HAVE_TRACING
+static void cpu_im_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_im_action_get_remains(surf_action_t action)
{
XBT_IN1("(%p)", action);
((surf_action_cpu_Cas01_im_t) action)->index_heap = i;
}
-static void cpu_im_init_bypass(const char* id,double power)
+static void cpu_im_create_resource(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)
{
- /* FIXME
- * the hard coded value must be passed as argument of the lua function
- * depending on the number of arguments the user pass to function
- * we'd affect it to the corresponding value
- */
- double power_peak = 0.0;
- double power_scale = 0.0;
- tmgr_trace_t power_trace = NULL;
- //FIXME : hard coded value
- e_surf_resource_state_t state_initial = SURF_RESOURCE_ON;
- tmgr_trace_t state_trace = NULL;
- power_peak = power;
- //FIXME : hard coded value !!!
- surf_parse_get_double(&power_scale, "1.0");
- power_trace = tmgr_trace_new("");
-
- //state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- current_property_set = xbt_dict_new();
- cpu_im_new(xbt_strdup(id), power_peak, power_scale,
- power_trace, state_initial, state_trace, current_property_set);
-
+ cpu_im_new(name, power_peak, power_scale, power_trace, core,
+ state_initial, state_trace, cpu_properties);
}
-
static void cpu_im_finalize(void)
{
void *cpu;
xbt_dict_cursor_t cursor;
char *key;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key, cpu) {
+ xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key,
+ cpu) {
cpu_Cas01_im_t CPU = cpu;
xbt_swag_free(CPU->action_set);
}
surf_model_exit(surf_cpu_model);
surf_cpu_model = NULL;
- xbt_swag_free(cpu_im_running_action_set_that_does_not_need_being_checked);
+ xbt_swag_free
+ (cpu_im_running_action_set_that_does_not_need_being_checked);
cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
xbt_heap_free(cpu_im_action_heap);
xbt_swag_free(cpu_im_modified_cpu);
surf_cpu_model = surf_model_init();
cpu_im_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_IM";
surf_cpu_model->model_private->resource_used = cpu_im_resource_used;
surf_cpu_model->model_private->share_resources = cpu_im_share_resources;
- surf_cpu_model->model_private->update_actions_state = cpu_im_update_actions_state;
+ surf_cpu_model->model_private->update_actions_state =
+ cpu_im_update_actions_state;
surf_cpu_model->model_private->update_resource_state =
- cpu_im_update_resource_state;
+ cpu_im_update_resource_state;
surf_cpu_model->model_private->finalize = cpu_im_finalize;
surf_cpu_model->suspend = cpu_im_action_suspend;
surf_cpu_model->is_suspended = cpu_im_action_is_suspended;
surf_cpu_model->set_max_duration = cpu_im_action_set_max_duration;
surf_cpu_model->set_priority = cpu_im_action_set_priority;
+#ifdef HAVE_TRACING
+ surf_cpu_model->set_category = cpu_im_action_set_category;
+#endif
surf_cpu_model->get_remains = cpu_im_action_get_remains;
surf_cpu_model->extension.cpu.execute = cpu_im_execute;
surf_cpu_model->extension.cpu.get_state = cpu_im_get_state;
surf_cpu_model->extension.cpu.get_speed = cpu_im_get_speed;
- surf_cpu_model->extension.cpu.get_available_speed = cpu_im_get_available_speed;
- surf_cpu_model->extension.cpu.init_bypass = cpu_im_init_bypass;
+ surf_cpu_model->extension.cpu.get_available_speed =
+ cpu_im_get_available_speed;
+ surf_cpu_model->extension.cpu.create_resource = cpu_im_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = cpu_im_add_traces_cpu;
if (!cpu_im_maxmin_system) {
sg_maxmin_selective_update = 1;
cpu_im_maxmin_system = lmm_system_new();
}
cpu_im_action_heap = xbt_heap_new(8, NULL);
- xbt_heap_set_update_callback(cpu_im_action_heap, cpu_im_action_update_index_heap);
- cpu_im_modified_cpu = xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
+ xbt_heap_set_update_callback(cpu_im_action_heap,
+ cpu_im_action_update_index_heap);
+ cpu_im_modified_cpu =
+ xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
}
/*********************************************************************/
cpu_im_define_callbacks(filename);
xbt_dynar_push(model_list, &surf_cpu_model);
}
-
-void surf_cpu_model_init_bypass_im(const char* id,double power)
-{
- return surf_cpu_model->extension.cpu.
- init_bypass(id,power);
-}
