X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/93bfd522e431912cc88a28252eb9bc4074c991fb..aebb26f5b9fc18433979c1d984cd9748c46f463c:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 3f40e53260..1aa1daac17 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -6,14 +6,13 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #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; +xbt_dict_t cpu_set = NULL; static void cpu_free(void *CPU) { @@ -30,8 +29,8 @@ static void cpu_free(void *CPU) state_trace values mean SURF_CPU_ON if >0 and SURF_CPU_OFF otherwise. */ -static cpu_t cpu_new(const char *name, xbt_maxmin_float_t power_scale, - xbt_maxmin_float_t power_initial, +static cpu_t cpu_new(const char *name, double power_scale, + double power_initial, tmgr_trace_t power_trace, e_surf_cpu_state_t state_initial, tmgr_trace_t state_trace) @@ -67,23 +66,23 @@ static cpu_t cpu_new(const char *name, xbt_maxmin_float_t power_scale, 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 + Type: string double double string ON/OFF string */ static void parse_cpu(void) { e_surf_token_t token; char *name = NULL; - xbt_maxmin_float_t power_scale = 0.0; - xbt_maxmin_float_t power_initial = 0.0; - tmgr_trace_t power_trace = NULL;; + double power_scale = 0.0; + double power_initial = 0.0; + tmgr_trace_t power_trace = NULL; e_surf_cpu_state_t state_initial = SURF_CPU_OFF; tmgr_trace_t state_trace = NULL; name = xbt_strdup(surf_parse_text); - surf_parse_float(&power_scale); - surf_parse_float(&power_initial); + surf_parse_double(&power_scale); + surf_parse_double(&power_initial); surf_parse_trace(&power_trace); token = surf_parse(); /* state_initial */ @@ -177,15 +176,15 @@ static void action_change_state(surf_action_t action, return; } -static xbt_heap_float_t share_resources(xbt_heap_float_t now) +static double share_resources(double now) { s_surf_action_cpu_t action; - return generic_maxmin_share_resources(surf_cpu_resource->common_public->states.running_action_set, - xbt_swag_offset(action,variable)); + return generic_maxmin_share_resources(surf_cpu_resource->common_public-> + states.running_action_set, + xbt_swag_offset(action, variable)); } -static void update_actions_state(xbt_heap_float_t now, - xbt_heap_float_t delta) +static void update_actions_state(double now, double delta) { surf_action_cpu_t action = NULL; surf_action_cpu_t next_action = NULL; @@ -197,16 +196,16 @@ static void update_actions_state(xbt_heap_float_t now, xbt_swag_foreach_safe(action, next_action, running_actions) { action->generic_action.remains -= lmm_variable_getvalue(action->variable) * delta; - if(action->generic_action.max_duration!=NO_MAX_DURATION) + if (action->generic_action.max_duration != NO_MAX_DURATION) action->generic_action.max_duration -= delta; /* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */ if (action->generic_action.remains <= 0) { action->generic_action.finish = surf_get_clock(); action_change_state((surf_action_t) action, SURF_ACTION_DONE); - } else if((action->generic_action.max_duration!=NO_MAX_DURATION) && - (action->generic_action.max_duration<=0)) { + } 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); + 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; @@ -234,17 +233,17 @@ static void update_actions_state(xbt_heap_float_t now, static void update_resource_state(void *id, tmgr_trace_event_t event_type, - xbt_maxmin_float_t value) + double value) { cpu_t cpu = id; -/* printf("[" XBT_HEAP_FLOAT_T "] Asking to update CPU \"%s\" with value " */ -/* XBT_MAXMIN_FLOAT_T " for event %p\n", surf_get_clock(), cpu->name, */ +/* printf("[" "%lg" "] Asking to update CPU \"%s\" with value " */ +/* "%lg" " 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(maxmin_system,cpu->constraint, + lmm_update_constraint_bound(maxmin_system, cpu->constraint, cpu->power_current * cpu->power_scale); } else if (event_type == cpu->state_event) { if (value > 0) @@ -259,7 +258,7 @@ static void update_resource_state(void *id, return; } -static surf_action_t execute(void *cpu, xbt_maxmin_float_t size) +static surf_action_t execute(void *cpu, double size) { surf_action_cpu_t action = NULL; cpu_t CPU = cpu; @@ -291,7 +290,7 @@ static surf_action_t execute(void *cpu, xbt_maxmin_float_t size) return (surf_action_t) action; } -static surf_action_t action_sleep(void *cpu, xbt_maxmin_float_t duration) +static surf_action_t action_sleep(void *cpu, double duration) { surf_action_cpu_t action = NULL; @@ -304,12 +303,14 @@ static surf_action_t action_sleep(void *cpu, xbt_maxmin_float_t duration) static void action_suspend(surf_action_t action) { - lmm_update_variable_weight(maxmin_system, ((surf_action_cpu_t) action)->variable, 0.0); + lmm_update_variable_weight(maxmin_system, + ((surf_action_cpu_t) action)->variable, 0.0); } static void action_resume(surf_action_t action) { - lmm_update_variable_weight(maxmin_system, ((surf_action_cpu_t) action)->variable, 1.0); + lmm_update_variable_weight(maxmin_system, + ((surf_action_cpu_t) action)->variable, 1.0); } static e_surf_cpu_state_t get_state(void *cpu) @@ -365,6 +366,7 @@ static void surf_cpu_resource_init_internal(void) 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->name = "CPU"; surf_cpu_resource->common_private->resource_used = resource_used; surf_cpu_resource->common_private->share_resources = share_resources; @@ -388,6 +390,8 @@ static void surf_cpu_resource_init_internal(void) void surf_cpu_resource_init(const char *filename) { + if (surf_cpu_resource) + return; surf_cpu_resource_init_internal(); parse_file(filename); xbt_dynar_push(resource_list, &surf_cpu_resource);