X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..6094020a03f9c10b954e3e1d32e1a3ffc75a8d7f:/src/surf/cpu.c diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 8f06026c71..2b7f6020e0 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -41,7 +41,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, xbt_dict_t cpu_properties) { cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1); - xbt_assert1(!surf_model_resource_by_name(surf_cpu_model, name), + xbt_assert1(!surf_cpu_resource_by_name(name), "Host '%s' declared several times in the platform file", name); cpu->generic_resource.model = surf_cpu_model; @@ -65,8 +65,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak, lmm_constraint_new(cpu_maxmin_system, cpu, cpu->core * cpu->power_scale * cpu->power_peak); - xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu, - surf_resource_free); + xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu); return cpu; } @@ -95,10 +94,9 @@ static void parse_cpu_init(void) state_initial = SURF_RESOURCE_OFF; state_trace = tmgr_trace_new(A_surfxml_host_state_file); - current_property_set = xbt_dict_new(); cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, power_trace, core, state_initial, state_trace, current_property_set); - + current_property_set = NULL; } static void add_traces_cpu(void) @@ -116,7 +114,7 @@ static void add_traces_cpu(void) /* connect all traces relative to hosts */ xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - cpu_Cas01_t host = surf_model_resource_by_name(surf_cpu_model, elm); + cpu_Cas01_t host = surf_cpu_resource_by_name(elm); xbt_assert1(host, "Host %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -127,7 +125,7 @@ static void add_traces_cpu(void) xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - cpu_Cas01_t host = surf_model_resource_by_name(surf_cpu_model, elm); + cpu_Cas01_t host = surf_cpu_resource_by_name(elm); xbt_assert1(host, "Host %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -139,7 +137,7 @@ static void add_traces_cpu(void) static void cpu_define_callbacks(const char *file) { - surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_init); + surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_init); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu); } @@ -294,7 +292,7 @@ static surf_action_t cpu_execute(void *cpu, double size) surf_action_cpu_Cas01_t action = NULL; cpu_Cas01_t CPU = cpu; - XBT_IN_F("(%s,%g)", surf_resource_name(CPU), size); + XBT_IN("(%s,%g)", surf_resource_name(CPU), size); action = surf_action_new(sizeof(s_surf_action_cpu_Cas01_t), size, surf_cpu_model, @@ -307,7 +305,7 @@ static surf_action_t cpu_execute(void *cpu, double size) action->generic_action.priority, CPU->power_scale * CPU->power_peak, 1); lmm_expand(cpu_maxmin_system, CPU->constraint, action->variable, 1.0); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } @@ -318,7 +316,7 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) if (duration > 0) duration = MAX(duration, MAXMIN_PRECISION); - XBT_IN_F("(%s,%g)", surf_resource_name(cpu), duration); + XBT_IN("(%s,%g)", surf_resource_name(cpu), duration); action = (surf_action_cpu_Cas01_t) cpu_execute(cpu, 1.0); action->generic_action.max_duration = duration; action->suspended = 2; @@ -332,32 +330,32 @@ static surf_action_t cpu_action_sleep(void *cpu, double duration) } lmm_update_variable_weight(cpu_maxmin_system, action->variable, 0.0); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } static void cpu_action_suspend(surf_action_t action) { - XBT_IN_F("(%p)", action); + XBT_IN("(%p)", action); if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, 0.0); ((surf_action_cpu_Cas01_t) action)->suspended = 1; } - XBT_OUT; + XBT_OUT(); } static void cpu_action_resume(surf_action_t action) { - XBT_IN_F("(%p)", action); + XBT_IN("(%p)", action); if (((surf_action_cpu_Cas01_t) action)->suspended != 2) { lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, action->priority); ((surf_action_cpu_Cas01_t) action)->suspended = 0; } - XBT_OUT; + XBT_OUT(); } static int cpu_action_is_suspended(surf_action_t action) @@ -368,36 +366,36 @@ static int cpu_action_is_suspended(surf_action_t action) static void cpu_action_set_max_duration(surf_action_t action, double duration) { - XBT_IN_F("(%p,%g)", action, duration); + XBT_IN("(%p,%g)", action, duration); action->max_duration = duration; - XBT_OUT; + XBT_OUT(); } static void cpu_action_set_priority(surf_action_t action, double priority) { - XBT_IN_F("(%p,%g)", action, priority); + XBT_IN("(%p,%g)", action, priority); action->priority = priority; lmm_update_variable_weight(cpu_maxmin_system, ((surf_action_cpu_Cas01_t) action)->variable, priority); - XBT_OUT; + XBT_OUT(); } #ifdef HAVE_TRACING static void cpu_action_set_category(surf_action_t action, const char *category) { - XBT_IN_F("(%p,%s)", action, category); + XBT_IN("(%p,%s)", action, category); action->category = xbt_strdup (category); - XBT_OUT; + XBT_OUT(); } #endif static double cpu_action_get_remains(surf_action_t action) { - XBT_IN_F("(%p)", action); + XBT_IN("(%p)", action); return action->remains; - XBT_OUT; + XBT_OUT(); } static e_surf_resource_state_t cpu_get_state(void *cpu)