#include "cpu_private.h"
#include "xbt/dict.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf ,"Logging specific to the SURF CPU module");
+
surf_cpu_resource_t surf_cpu_resource = NULL;
static xbt_dict_t cpu_set = NULL;
-static lmm_system_t sys = NULL;
/* power_scale is the basic power of the cpu when the cpu is
completely available. initial_power is therefore expected to be
otherwise.
*/
-static void *new_cpu(const char *name, xbt_maxmin_float_t power_scale,
+static void cpu_free(void *CPU){
+ cpu_t cpu = CPU;
+
+/* lmm_constraint_free(maxmin_system,cpu->constraint); */
+/* Clean somewhere else ! */
+
+ xbt_free(cpu);
+}
+
+static void *cpu_new(const char *name, xbt_maxmin_float_t power_scale,
xbt_maxmin_float_t initial_power, tmgr_trace_t power_trace,
e_surf_cpu_state_t initial_state, tmgr_trace_t state_trace)
{
if(state_trace)
cpu->state_event = tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
- cpu->constraint = lmm_constraint_new(sys, cpu, cpu->current_power * cpu->power_scale);
+ cpu->constraint = lmm_constraint_new(maxmin_system, cpu, cpu->current_power * cpu->power_scale);
- xbt_dict_set(cpu_set, name, cpu, NULL);
+ xbt_dict_set(cpu_set, name, cpu, cpu_free);
return cpu;
}
+/*
+ Semantic: name scale initial power initial state
+ power trace state trace
+
+ Token: TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD
+ Type: string float float string ON/OFF string
+*/
+
+static void parse_host(void)
+{
+ e_surf_token_t token;
+ char *name = NULL;
+ xbt_maxmin_float_t power_scale = 0.0;
+ xbt_maxmin_float_t initial_power = 0.0;
+ tmgr_trace_t power_trace = NULL;;
+ e_surf_cpu_state_t initial_state = SURF_CPU_OFF;
+ tmgr_trace_t state_trace = NULL;
+
+ name=xbt_strdup(surf_parse_text);
+
+ token=surf_parse(); /* power_scale */
+ xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+ xbt_assert2((sscanf(surf_parse_text,XBT_MAXMIN_FLOAT_T, &power_scale)==1),
+ "Parse error line %d : %s not a number",line_pos,surf_parse_text);
+
+ token=surf_parse(); /* initial_power */
+ xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+ xbt_assert2((sscanf(surf_parse_text,XBT_MAXMIN_FLOAT_T, &initial_power)==1),
+ "Parse error line %d : %s not a number",line_pos,surf_parse_text);
+
+ token=surf_parse(); /* power_trace */
+ xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+ if(strcmp(surf_parse_text,"")==0) power_trace = NULL;
+ else power_trace = tmgr_trace_new(surf_parse_text);
+
+ token=surf_parse(); /* initial_state */
+ xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+ if(strcmp(surf_parse_text,"ON")==0) initial_state = SURF_CPU_ON;
+ else if(strcmp(surf_parse_text,"OFF")==0) initial_state = SURF_CPU_OFF;
+ else {
+ CRITICAL2("Invalid cpu state (line %d): %s neq ON or OFF\n",line_pos,
+ surf_parse_text);
+ xbt_abort();
+ }
+
+ token=surf_parse(); /* state_trace */
+ xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+ if(strcmp(surf_parse_text,"")==0) state_trace = NULL;
+ else state_trace = tmgr_trace_new(surf_parse_text);
+
+ cpu_new(name, power_scale, initial_power, power_trace, initial_state, state_trace);
+}
+
static void parse_file(const char *file)
{
- tmgr_trace_t trace_A = tmgr_trace_new("trace_A.txt");
- tmgr_trace_t trace_B = tmgr_trace_new("trace_B.txt");
+ e_surf_token_t token;
+
+ find_section(file,"CPU");
+
+ while(1) {
+ token=surf_parse();
- new_cpu("Cpu A", 20.0, 1.0, trace_A, SURF_CPU_ON, NULL);
- new_cpu("Cpu B", 100.0, 1.0, trace_B, SURF_CPU_ON, NULL);
+ if(token==TOKEN_END_SECTION) break;
+ if(token==TOKEN_NEWLINE) continue;
+
+ if(token==TOKEN_WORD) parse_host();
+ else {
+ CRITICAL1("Parse error line %d\n",line_pos);
+ xbt_abort();
+ }
+ }
+
+ close_section("CPU");
}
static void *name_service(const char *name)
static int resource_used(void *resource_id)
{
- return lmm_constraint_used(sys, ((cpu_t)resource_id)->constraint);
+ return lmm_constraint_used(maxmin_system, ((cpu_t)resource_id)->constraint);
}
-static surf_action_t action_new(void *callback)
+static void action_free(surf_action_t action)
{
- return NULL;
-}
+ surf_action_cpu_t Action = (surf_action_cpu_t) action;
-static e_surf_action_state_t action_get_state(surf_action_t action)
-{
- return SURF_ACTION_NOT_IN_THE_SYSTEM;
-}
+ xbt_swag_remove(action,action->state_set);
+ lmm_variable_free(maxmin_system,Action->variable);
+ xbt_free(action);
-static void action_free(surf_action_t * action)
-{
return;
}
return;
}
-static xbt_heap_float_t share_resources()
+static xbt_heap_float_t share_resources(xbt_heap_float_t now)
{
surf_action_cpu_t action = NULL;
xbt_swag_t running_actions= surf_cpu_resource->common_public->states.running_action_set;
xbt_maxmin_float_t min = -1;
xbt_maxmin_float_t value = -1;
- lmm_solve(sys);
+ lmm_solve(maxmin_system);
action = xbt_swag_getFirst(running_actions);
if(!action) return 0.0;
surf_action_cpu_t action = NULL;
surf_action_cpu_t next_action = NULL;
xbt_swag_t running_actions= surf_cpu_resource->common_public->states.running_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) {
action->generic_action.remains -=
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
if(action->generic_action.remains<=0) {
action_change_state((surf_action_t)action, SURF_ACTION_DONE);
- } /* else if(host_failed..) */
+ } else { /* Need to check that none of the resource has failed*/
+ lmm_constraint_t cnst = NULL;
+ int i=0;
+ cpu_t cpu = NULL;
+
+ while((cnst=lmm_get_cnst_from_var(maxmin_system, action->variable, i++))) {
+ cpu = lmm_constraint_id(cnst);
+ if(cpu->current_state==SURF_CPU_OFF) {
+ action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
+ break;
+ }
+ }
+ }
+ }
+
+ xbt_swag_foreach_safe(action, next_action, failed_actions) {
+ lmm_variable_disable(maxmin_system, action->variable);
}
return;
{
cpu_t cpu = id;
- printf("Asking to update \"%s\" with value " XBT_MAXMIN_FLOAT_T " for event %p\n",
- cpu->name, value, event_type);
+ printf("[" XBT_HEAP_FLOAT_T "] Asking to update \"%s\" with value " XBT_MAXMIN_FLOAT_T " for event %p\n",
+ surf_get_clock(), cpu->name, value, event_type);
if(event_type==cpu->power_event) {
cpu->current_power = value;
} else if (event_type==cpu->state_event) {
if(value>0) cpu->current_state = SURF_CPU_ON;
else cpu->current_state = SURF_CPU_OFF;
- } else abort();
+ } else {CRITICAL0("Unknown event ! \n");xbt_abort();}
return;
}
static surf_action_t execute(void *cpu, xbt_maxmin_float_t size)
{
- lmm_variable_t var;
surf_action_cpu_t action = NULL;
-
+ cpu_t CPU = cpu;
+
action=xbt_new0(s_surf_action_cpu_t,1);
action->generic_action.cost=size;
action->generic_action.callback=cpu;
action->generic_action.resource_type=(surf_resource_t)surf_cpu_resource;
- action->generic_action.state_set=surf_cpu_resource->common_public->states.running_action_set;
+ if(CPU->current_state==SURF_CPU_ON)
+ action->generic_action.state_set=surf_cpu_resource->common_public->states.running_action_set;
+ else
+ 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(sys, action, 1.0, -1.0, 1);
- lmm_expand(sys, ((cpu_t)cpu)->constraint, action->variable, 1.0);
+ action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0, 1);
+ lmm_expand(maxmin_system, ((cpu_t)cpu)->constraint, action->variable, 1.0);
return (surf_action_t) action;
}
return SURF_CPU_OFF;
}
+static void finalize(void)
+{
+ xbt_dict_free(&cpu_set);
+ xbt_swag_free(surf_cpu_resource->common_public->states.ready_action_set);
+ xbt_swag_free(surf_cpu_resource->common_public->states.running_action_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);
+
+ xbt_free(surf_cpu_resource);
+ surf_cpu_resource = NULL;
+}
+
static void surf_cpu_resource_init_internal(void)
{
s_surf_action_t action;
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 = action_change_state;
+
surf_cpu_resource->common_private->share_resources = share_resources;
surf_cpu_resource->common_private->update_actions_state = update_actions_state;
surf_cpu_resource->common_private->update_resource_state = update_resource_state;
+ surf_cpu_resource->common_private->finalize = finalize;
surf_cpu_resource->extension_public->execute = execute;
surf_cpu_resource->extension_public->get_state = get_state;
cpu_set = xbt_dict_new();
- sys = lmm_system_new();
+ xbt_assert0(maxmin_system,"surf_init has to be called first!");
}
void surf_cpu_resource_init(const char* filename)
