static void cpu_free(void *cpu)
{
- xbt_free(((cpu_Cas01_t)cpu)->name);
- xbt_free(cpu);
+ free(((cpu_Cas01_t)cpu)->name);
+ free(cpu);
}
static cpu_Cas01_t cpu_new(char *name, double power_scale,
e_surf_cpu_state_t state_initial = SURF_CPU_OFF;
tmgr_trace_t state_trace = NULL;
- name = xbt_strdup(A_cpu_name);
- surf_parse_get_double(&power_scale,A_cpu_power);
- surf_parse_get_double(&power_initial,A_cpu_availability);
- surf_parse_get_trace(&power_trace,A_cpu_availability_file);
+ name = xbt_strdup(A_surfxml_cpu_name);
+ surf_parse_get_double(&power_scale,A_surfxml_cpu_power);
+ surf_parse_get_double(&power_initial,A_surfxml_cpu_availability);
+ surf_parse_get_trace(&power_trace,A_surfxml_cpu_availability_file);
- xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF),
- "Invalid state")
- if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON;
- if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF;
- surf_parse_get_trace(&state_trace,A_cpu_state_file);
+ xbt_assert0((A_surfxml_cpu_state==A_surfxml_cpu_state_ON)||
+ (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF),
+ "Invalid state");
+ if (A_surfxml_cpu_state==A_surfxml_cpu_state_ON) state_initial = SURF_CPU_ON;
+ if (A_surfxml_cpu_state==A_surfxml_cpu_state_OFF) state_initial = SURF_CPU_OFF;
+ surf_parse_get_trace(&state_trace,A_surfxml_cpu_state_file);
cpu_new(name, power_scale, power_initial, power_trace, state_initial,
state_trace);
static void parse_file(const char *file)
{
surf_parse_reset_parser();
- ETag_cpu_fun=parse_cpu;
+ ETag_surfxml_cpu_fun=parse_cpu;
surf_parse_open(file);
xbt_assert1((!surf_parse()),"Parse error in %s",file);
surf_parse_close();
static void *name_service(const char *name)
{
- void *cpu = NULL;
-
- xbt_dict_get(cpu_set, name, &cpu);
-
- return cpu;
+ return xbt_dict_get_or_null(cpu_set, name);
}
static const char *get_resource_name(void *resource_id)
((cpu_Cas01_t) resource_id)->constraint);
}
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
{
- xbt_swag_remove(action, action->state_set);
- if(((surf_action_cpu_Cas01_t)action)->variable)
- lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
- xbt_free(action);
+ action->using--;
+ if(!action->using) {
+ xbt_swag_remove(action, action->state_set);
+ if(((surf_action_cpu_Cas01_t)action)->variable)
+ lmm_variable_free(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
+ free(action);
+ return 1;
+ }
+ return 0;
+}
- return;
+static void action_use(surf_action_t action)
+{
+ action->using++;
}
static void action_cancel(surf_action_t action)
{
+ surf_action_change_state(action, SURF_ACTION_FAILED);
return;
}
static void action_recycle(surf_action_t action)
{
- return;
+ DIE_IMPOSSIBLE;
}
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
- if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
- if(((surf_action_cpu_Cas01_t)action)->variable) {
- lmm_variable_disable(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable);
- ((surf_action_cpu_Cas01_t)action)->variable = NULL;
- }
+/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/* if(((surf_action_cpu_Cas01_t)action)->variable) { */
+/* lmm_variable_disable(maxmin_system, ((surf_action_cpu_Cas01_t)action)->variable); */
+/* ((surf_action_cpu_Cas01_t)action)->variable = NULL; */
+/* } */
surf_action_change_state(action, state);
return;
surf_action_cpu_Cas01_t next_action = NULL;
xbt_swag_t running_actions =
surf_cpu_resource->common_public->states.running_action_set;
+ /* FIXME: UNUSED
xbt_swag_t failed_actions =
surf_cpu_resource->common_public->states.failed_action_set;
+ */
xbt_swag_foreach_safe(action, next_action, running_actions) {
surf_double_update(&(action->generic_action.remains),
surf_action_cpu_Cas01_t action = NULL;
cpu_Cas01_t CPU = cpu;
+ XBT_IN2("(%s,%g)",CPU->name,size);
action = xbt_new0(s_surf_action_cpu_Cas01_t, 1);
+ action->generic_action.using = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
+ action->generic_action.priority = 1.0;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
surf_cpu_resource->common_public->states.failed_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
- action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, 1);
+ action->variable = lmm_variable_new(maxmin_system, action,
+ action->generic_action.priority, -1.0, 1);
lmm_expand(maxmin_system, CPU->constraint, action->variable,
1.0);
-
+ XBT_OUT;
return (surf_action_t) action;
}
{
surf_action_cpu_Cas01_t action = NULL;
+ XBT_IN2("(%s,%g)",((cpu_Cas01_t)cpu)->name,duration);
action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
action->generic_action.max_duration = duration;
lmm_update_variable_weight(maxmin_system, action->variable, 0.0);
-
+ XBT_OUT;
return (surf_action_t) action;
}
static void action_suspend(surf_action_t action)
{
+ XBT_IN1("(%p)",action);
lmm_update_variable_weight(maxmin_system,
((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+ XBT_OUT;
}
static void action_resume(surf_action_t action)
{
+ XBT_IN1("(%p)",action);
lmm_update_variable_weight(maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable, 1.0);
+ ((surf_action_cpu_Cas01_t) action)->variable,
+ action->priority);
+ XBT_OUT;
}
static int action_is_suspended(surf_action_t action)
return (lmm_get_variable_weight(((surf_action_cpu_Cas01_t) action)->variable) == 0.0);
}
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+ XBT_IN2("(%p,%g)",action,duration);
+ action->max_duration = duration;
+ XBT_OUT;
+}
+
+static void action_set_priority(surf_action_t action, double priority)
+{
+ XBT_IN2("(%p,%g)",action,priority);
+ action->priority = priority;
+ XBT_OUT;
+}
+
static e_surf_cpu_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);
+}
+
static void finalize(void)
{
xbt_dict_free(&cpu_set);
xbt_swag_free(surf_cpu_resource->common_public->states.
failed_action_set);
xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
- xbt_free(surf_cpu_resource->common_public);
- xbt_free(surf_cpu_resource->common_private);
- xbt_free(surf_cpu_resource->extension_public);
+ free(surf_cpu_resource->common_public);
+ free(surf_cpu_resource->common_private);
+ free(surf_cpu_resource->extension_public);
- xbt_free(surf_cpu_resource);
+ free(surf_cpu_resource);
surf_cpu_resource = NULL;
}
surf_cpu_resource->common_public->action_get_state =
surf_action_get_state;
surf_cpu_resource->common_public->action_free = action_free;
+ surf_cpu_resource->common_public->action_use = action_use;
surf_cpu_resource->common_public->action_cancel = action_cancel;
surf_cpu_resource->common_public->action_recycle = action_recycle;
surf_cpu_resource->common_public->action_change_state =
surf_cpu_resource->common_public->suspend = action_suspend;
surf_cpu_resource->common_public->resume = action_resume;
surf_cpu_resource->common_public->is_suspended = action_is_suspended;
-
+ surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
+ surf_cpu_resource->common_public->set_priority = action_set_priority;
surf_cpu_resource->extension_public->execute = execute;
surf_cpu_resource->extension_public->sleep = action_sleep;
surf_cpu_resource->extension_public->get_state = get_state;
+ surf_cpu_resource->extension_public->get_speed = get_speed;
cpu_set = xbt_dict_new();
