From d8d97d835782d0906f8c5a8d0d335fefae36873a Mon Sep 17 00:00:00 2001 From: alegrand Date: Thu, 2 Dec 2004 23:34:49 +0000 Subject: [PATCH] Cosmetics git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@542 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/surf/cpu.c | 292 ++++++++++++++++++++++++----------------- src/surf/cpu_private.h | 10 +- 2 files changed, 174 insertions(+), 128 deletions(-) diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 83dd5bc370..879f2ac5ad 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -6,7 +6,8 @@ #include "cpu_private.h" #include "xbt/dict.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf ,"Logging specific to the SURF CPU module"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf, + "Logging specific to the SURF CPU module"); surf_cpu_resource_t surf_cpu_resource = NULL; @@ -19,7 +20,8 @@ static xbt_dict_t cpu_set = NULL; otherwise. */ -static void cpu_free(void *CPU){ +static void cpu_free(void *CPU) +{ cpu_t cpu = CPU; /* lmm_constraint_free(maxmin_system,cpu->constraint); */ @@ -28,26 +30,32 @@ static void cpu_free(void *CPU){ 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) +static cpu_t 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) { - cpu_t cpu = xbt_new0(s_cpu_t,1); + cpu_t cpu = xbt_new0(s_cpu_t, 1); cpu->resource = (surf_resource_t) surf_cpu_resource; cpu->name = name; cpu->power_scale = power_scale; - cpu->current_power = initial_power; + cpu->power_current = initial_power; /* cpu->power_trace = power_trace; */ - if(power_trace) - cpu->power_event = tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); + if (power_trace) + cpu->power_event = + tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); - cpu->current_state = initial_state; + cpu->state_current = initial_state; /* cpu->state_trace = state_trace; */ - if(state_trace) - cpu->state_event = tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); + if (state_trace) + cpu->state_event = + tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); - cpu->constraint = lmm_constraint_new(maxmin_system, cpu, cpu->current_power * cpu->power_scale); + cpu->constraint = + lmm_constraint_new(maxmin_system, cpu, + cpu->power_current * cpu->power_scale); xbt_dict_set(cpu_set, name, cpu, cpu_free); @@ -65,74 +73,86 @@ static void *cpu_new(const char *name, xbt_maxmin_float_t power_scale, static void parse_host(void) { e_surf_token_t token; - char *name = NULL; + 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); + name = xbt_strdup(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_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(); /* 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_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(); /* 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; + 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, + 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); + 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); + cpu_new(name, power_scale, initial_power, power_trace, initial_state, + state_trace); } static void parse_file(const char *file) { e_surf_token_t token; - find_section(file,"CPU"); + find_section(file, "CPU"); - while(1) { - token=surf_parse(); + while (1) { + token = surf_parse(); - if(token==TOKEN_END_SECTION) break; - if(token==TOKEN_NEWLINE) continue; - - if(token==TOKEN_WORD) parse_host(); + 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); + CRITICAL1("Parse error line %d\n", line_pos); xbt_abort(); } } - close_section("CPU"); + close_section("CPU"); } static void *name_service(const char *name) { - void *cpu=NULL; - + void *cpu = NULL; + xbt_dict_get(cpu_set, name, &cpu); return cpu; @@ -145,15 +165,16 @@ static const char *get_resource_name(void *resource_id) static int resource_used(void *resource_id) { - return lmm_constraint_used(maxmin_system, ((cpu_t)resource_id)->constraint); + return lmm_constraint_used(maxmin_system, + ((cpu_t) resource_id)->constraint); } static void action_free(surf_action_t action) { surf_action_cpu_t Action = (surf_action_cpu_t) action; - xbt_swag_remove(action,action->state_set); - lmm_variable_free(maxmin_system,Action->variable); + xbt_swag_remove(action, action->state_set); + lmm_variable_free(maxmin_system, Action->variable); xbt_free(action); return; @@ -169,7 +190,8 @@ static void action_recycle(surf_action_t action) return; } -static void action_change_state(surf_action_t action, e_surf_action_state_t state) +static void action_change_state(surf_action_t action, + e_surf_action_state_t state) { surf_action_change_state(action, state); return; @@ -178,20 +200,23 @@ static void action_change_state(surf_action_t action, e_surf_action_state_t stat 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_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(maxmin_system); + lmm_solve(maxmin_system); action = xbt_swag_getFirst(running_actions); - if(!action) return 0.0; + if (!action) + return 0.0; value = lmm_variable_getvalue(action->variable); - min = action->generic_action.remains / value ; + min = action->generic_action.remains / value; - xbt_swag_foreach(action,running_actions) { - value = action->generic_action.remains / - lmm_variable_getvalue(action->variable); - if(valuegeneric_action.remains / + lmm_variable_getvalue(action->variable); + if (value < min) + min = value; } return min; @@ -202,24 +227,28 @@ static void update_actions_state(xbt_heap_float_t now, { 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_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 -= - lmm_variable_getvalue(action->variable)*delta; + action->generic_action.remains -= + lmm_variable_getvalue(action->variable) * delta; /* 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 { /* Need to check that none of the resource has failed*/ + if (action->generic_action.remains <= 0) { + action_change_state((surf_action_t) action, SURF_ACTION_DONE); + } else { /* Need to check that none of the resource has failed */ lmm_constraint_t cnst = NULL; - int i=0; + int i = 0; cpu_t cpu = NULL; - while((cnst=lmm_get_cnst_from_var(maxmin_system, action->variable, i++))) { + 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); + if (cpu->state_current == SURF_CPU_OFF) { + action_change_state((surf_action_t) action, SURF_ACTION_FAILED); break; } } @@ -234,21 +263,28 @@ static void update_actions_state(xbt_heap_float_t now, } static void update_resource_state(void *id, - tmgr_trace_event_t event_type, + tmgr_trace_event_t event_type, xbt_maxmin_float_t value) { cpu_t cpu = id; - - 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; - lmm_update_constraint_bound(cpu->constraint,cpu->current_power * cpu->power_scale); - } else if (event_type==cpu->state_event) { - if(value>0) cpu->current_state = SURF_CPU_ON; - else cpu->current_state = SURF_CPU_OFF; - } else {CRITICAL0("Unknown event ! \n");xbt_abort();} + + 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->power_current = value; + lmm_update_constraint_bound(cpu->constraint, + cpu->power_current * cpu->power_scale); + } else if (event_type == cpu->state_event) { + if (value > 0) + cpu->state_current = SURF_CPU_ON; + else + cpu->state_current = SURF_CPU_OFF; + } else { + CRITICAL0("Unknown event ! \n"); + xbt_abort(); + } return; } @@ -257,24 +293,28 @@ static surf_action_t execute(void *cpu, xbt_maxmin_float_t size) { 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.remains=size; - action->generic_action.start=-1.0; - action->generic_action.finish=-1.0; - action->generic_action.callback=cpu; - action->generic_action.resource_type=(surf_resource_t)surf_cpu_resource; - - 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 = xbt_new0(s_surf_action_cpu_t, 1); + + action->generic_action.cost = size; + action->generic_action.remains = size; + action->generic_action.start = -1.0; + action->generic_action.finish = -1.0; + action->generic_action.callback = cpu; + action->generic_action.resource_type = + (surf_resource_t) surf_cpu_resource; + + if (CPU->state_current == 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(maxmin_system, action, 1.0, -1.0, 1); - lmm_expand(maxmin_system, ((cpu_t)cpu)->constraint, action->variable, 1.0); + lmm_expand(maxmin_system, ((cpu_t) cpu)->constraint, action->variable, + 1.0); return (surf_action_t) action; } @@ -288,8 +328,10 @@ 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. + 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); @@ -303,34 +345,40 @@ static void surf_cpu_resource_init_internal(void) { s_surf_action_t action; - surf_cpu_resource = xbt_new0(s_surf_cpu_resource_t,1); - - surf_cpu_resource->common_private = xbt_new0(s_surf_resource_private_t,1); - surf_cpu_resource->common_public = xbt_new0(s_surf_resource_public_t,1); -/* surf_cpu_resource->extension_private = xbt_new0(s_surf_cpu_resource_extension_private_t,1); */ - surf_cpu_resource->extension_public = xbt_new0(s_surf_cpu_resource_extension_public_t,1); + surf_cpu_resource = xbt_new0(s_surf_cpu_resource_t, 1); - surf_cpu_resource->common_public->states.ready_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); - surf_cpu_resource->common_public->states.running_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); - surf_cpu_resource->common_public->states.failed_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); - surf_cpu_resource->common_public->states.done_action_set= - xbt_swag_new(xbt_swag_offset(action,state_hookup)); + surf_cpu_resource->common_private = + xbt_new0(s_surf_resource_private_t, 1); + surf_cpu_resource->common_public = xbt_new0(s_surf_resource_public_t, 1); +/* surf_cpu_resource->extension_private = xbt_new0(s_surf_cpu_resource_extension_private_t,1); */ + surf_cpu_resource->extension_public = + xbt_new0(s_surf_cpu_resource_extension_public_t, 1); + + surf_cpu_resource->common_public->states.ready_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_cpu_resource->common_public->states.running_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_cpu_resource->common_public->states.failed_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); + surf_cpu_resource->common_public->states.done_action_set = + xbt_swag_new(xbt_swag_offset(action, state_hookup)); surf_cpu_resource->common_public->name_service = name_service; surf_cpu_resource->common_public->get_resource_name = get_resource_name; surf_cpu_resource->common_public->resource_used = resource_used; - surf_cpu_resource->common_public->action_get_state=surf_action_get_state; + 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_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_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->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; @@ -338,10 +386,10 @@ static void surf_cpu_resource_init_internal(void) cpu_set = xbt_dict_new(); - xbt_assert0(maxmin_system,"surf_init has to be called first!"); + xbt_assert0(maxmin_system, "surf_init has to be called first!"); } -void surf_cpu_resource_init(const char* filename) +void surf_cpu_resource_init(const char *filename) { surf_cpu_resource_init_internal(); parse_file(filename); diff --git a/src/surf/cpu_private.h b/src/surf/cpu_private.h index 7897a9dc43..9b86b44592 100644 --- a/src/surf/cpu_private.h +++ b/src/surf/cpu_private.h @@ -14,15 +14,13 @@ typedef struct surf_action_cpu { } s_surf_action_cpu_t, *surf_action_cpu_t; typedef struct cpu { - surf_resource_t resource; /* Any such object, added in a trace - should start by this field!!! */ + surf_resource_t resource; /* Any such object, added in a trace + should start by this field!!! */ const char *name; xbt_maxmin_float_t power_scale; - xbt_maxmin_float_t current_power; -/* tmgr_trace_t power_trace; */ + xbt_maxmin_float_t power_current; tmgr_trace_event_t power_event; - e_surf_cpu_state_t current_state; -/* tmgr_trace_t state_trace; */ + e_surf_cpu_state_t state_current; tmgr_trace_event_t state_event; lmm_constraint_t constraint; } s_cpu_t, *cpu_t; -- 2.20.1