/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "cpu_private.h"
+#include "surf_private.h"
+
+typedef s_surf_action_maxmin_t s_surf_action_cpu_Cas01_t, *surf_action_cpu_Cas01_t;
+
+typedef struct cpu_Cas01 {
+ s_surf_resource_t generic_resource;
+ double power_scale;
+ double power_current;
+ tmgr_trace_event_t power_event;
+ e_surf_cpu_state_t state_current;
+ tmgr_trace_event_t state_event;
+ lmm_constraint_t constraint;
+} s_cpu_Cas01_t, *cpu_Cas01_t;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf,
"Logging specific to the SURF CPU module");
+
+
surf_model_t surf_cpu_model = NULL;
lmm_system_t cpu_maxmin_system = NULL;
static xbt_swag_t running_action_set_that_does_not_need_being_checked = NULL;
-static void cpu_free(void *cpu)
-{
- xbt_dict_free(&(((cpu_Cas01_t) cpu)->properties));
- surf_resource_free(cpu);
-}
-
static cpu_Cas01_t cpu_new(char *name, double power_scale,
double power_initial,
tmgr_trace_t power_trace,
"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;
xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
cpu->power_current = power_initial;
lmm_constraint_new(cpu_maxmin_system, cpu,
cpu->power_current * cpu->power_scale);
- /*add the property set */
- cpu->properties = cpu_properties;
-
- current_property_set = cpu_properties;
-
- xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, cpu_free);
+ xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, surf_resource_free);
return cpu;
}
((cpu_Cas01_t) resource_id)->constraint);
}
-static int action_free(surf_action_t action)
+static int action_unref(surf_action_t action)
{
action->refcount--;
if (!action->refcount) {
return 0;
}
-static void action_use(surf_action_t action)
-{
- action->refcount++;
-}
-
static void action_cancel(surf_action_t action)
{
- surf_action_change_state(action, SURF_ACTION_FAILED);
+ surf_action_state_set(action, SURF_ACTION_FAILED);
return;
}
-static void action_change_state(surf_action_t action,
+static void cpu_action_state_set(surf_action_t action,
e_surf_action_state_t state)
{
/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
/* ((surf_action_cpu_Cas01_t)action)->variable = NULL; */
/* } */
- surf_action_change_state(action, state);
+ surf_action_state_set(action, state);
return;
}
surf_action_cpu_Cas01_t action = NULL;
surf_action_cpu_Cas01_t next_action = NULL;
xbt_swag_t running_actions = surf_cpu_model->states.running_action_set;
- /* FIXME: UNUSED
- xbt_swag_t failed_actions =
- surf_cpu_model->states.failed_action_set;
- */
xbt_swag_foreach_safe(action, next_action, running_actions) {
double_update(&(action->generic_action.remains),
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable) > 0)) {
action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
} else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
(action->generic_action.max_duration <= 0)) {
action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ cpu_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
}
}
while ((var = lmm_get_var_from_cnst(cpu_maxmin_system, cnst, &elem))) {
surf_action_t action = lmm_variable_id(var);
- if (surf_action_get_state(action) == SURF_ACTION_RUNNING ||
- surf_action_get_state(action) == SURF_ACTION_READY ||
- surf_action_get_state(action) == SURF_ACTION_NOT_IN_THE_SYSTEM) {
+ 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) {
action->finish = date;
- action_change_state(action, SURF_ACTION_FAILED);
+ cpu_action_state_set(action, SURF_ACTION_FAILED);
}
}
}
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.refcount = 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.model_type = surf_cpu_model;
+ 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_CPU_ON);
+
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
- if (CPU->state_current == SURF_CPU_ON)
- action->generic_action.state_set =
- surf_cpu_model->states.running_action_set;
- else
- action->generic_action.state_set =
- surf_cpu_model->states.failed_action_set;
-
- xbt_swag_insert(action, action->generic_action.state_set);
-
action->variable = lmm_variable_new(cpu_maxmin_system, action,
action->generic_action.priority,
-1.0, 1);
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->name, duration);
+ XBT_IN2("(%s,%g)", ((cpu_Cas01_t) cpu)->generic_resource.name, duration);
action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
return ((cpu_Cas01_t) cpu)->power_current;
}
-static xbt_dict_t get_properties(void *cpu)
-{
- return ((cpu_Cas01_t) cpu)->properties;
-}
-
static void finalize(void)
{
lmm_system_free(cpu_maxmin_system);
running_action_set_that_does_not_need_being_checked =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_cpu_model->action_get_state = surf_action_get_state;
- surf_cpu_model->action_get_start_time = surf_action_get_start_time;
- surf_cpu_model->action_get_finish_time = surf_action_get_finish_time;
- surf_cpu_model->action_free = action_free;
- surf_cpu_model->action_use = action_use;
- surf_cpu_model->action_cancel = action_cancel;
- surf_cpu_model->action_change_state = action_change_state;
- surf_cpu_model->action_set_data = surf_action_set_data;
surf_cpu_model->name = "CPU";
+ surf_cpu_model->action_unref = action_unref;
+ surf_cpu_model->action_cancel = action_cancel;
+ surf_cpu_model->action_state_set = cpu_action_state_set;
+
surf_cpu_model->model_private->resource_used = resource_used;
surf_cpu_model->model_private->share_resources = share_resources;
surf_cpu_model->model_private->update_actions_state = update_actions_state;
surf_cpu_model->extension.cpu.get_state = get_state;
surf_cpu_model->extension.cpu.get_speed = get_speed;
surf_cpu_model->extension.cpu.get_available_speed = get_available_speed;
- /*manage the properties of the cpu */
- surf_cpu_model->get_properties = get_properties;
if (!cpu_maxmin_system)
cpu_maxmin_system = lmm_system_new();
