A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I don't think it does what it should now but at least it looks better and
[simgrid.git]
/
src
/
surf
/
cpu.c
diff --git
a/src/surf/cpu.c
b/src/surf/cpu.c
index
36774f1
..
e3c0967
100644
(file)
--- a/
src/surf/cpu.c
+++ b/
src/surf/cpu.c
@@
-66,7
+66,7
@@
static void parse_cpu(void)
surf_parse_get_trace(&power_trace,A_cpu_availability_file);
xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF),
surf_parse_get_trace(&power_trace,A_cpu_availability_file);
xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF),
- "Invalid state")
+ "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);
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);
@@
-86,11
+86,7
@@
static void parse_file(const char *file)
static void *name_service(const char *name)
{
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)
}
static const char *get_resource_name(void *resource_id)
@@
-124,6
+120,7
@@
static void action_use(surf_action_t action)
static void action_cancel(surf_action_t action)
{
static void action_cancel(surf_action_t action)
{
+ surf_action_change_state(action, SURF_ACTION_FAILED);
return;
}
return;
}
@@
-159,8
+156,10
@@
static void update_actions_state(double now, double delta)
surf_action_cpu_Cas01_t next_action = NULL;
xbt_swag_t running_actions =
surf_cpu_resource->common_public->states.running_action_set;
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_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),
xbt_swag_foreach_safe(action, next_action, running_actions) {
surf_double_update(&(action->generic_action.remains),
@@
-229,6
+228,7
@@
static surf_action_t execute(void *cpu, double size)
action->generic_action.using = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
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;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
action->generic_action.finish = -1.0;
@@
-243,7
+243,8
@@
static surf_action_t execute(void *cpu, double size)
surf_cpu_resource->common_public->states.failed_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
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);
lmm_expand(maxmin_system, CPU->constraint, action->variable,
1.0);
@@
-270,7
+271,8
@@
static void action_suspend(surf_action_t action)
static void action_resume(surf_action_t action)
{
lmm_update_variable_weight(maxmin_system,
static void action_resume(surf_action_t 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);
}
static int action_is_suspended(surf_action_t action)
}
static int action_is_suspended(surf_action_t action)
@@
-278,11
+280,26
@@
static int action_is_suspended(surf_action_t action)
return (lmm_get_variable_weight(((surf_action_cpu_Cas01_t) action)->variable) == 0.0);
}
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)
+{
+ action->max_duration = duration;
+}
+
+static void action_set_priority(surf_action_t action, double priority)
+{
+ action->priority = priority;
+}
+
static e_surf_cpu_state_t get_state(void *cpu)
{
return ((cpu_Cas01_t) cpu)->state_current;
}
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);
static void finalize(void)
{
xbt_dict_free(&cpu_set);
@@
-346,11
+363,13
@@
static void surf_cpu_resource_init_internal(void)
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->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->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();
cpu_set = xbt_dict_new();