s_surf_action_cpu_Cas01_im_t action;
cpu = xbt_new0(s_cpu_Cas01_im_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;
lmm_constraint_new(cpu_im_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);
cpu->action_set = xbt_swag_new(xbt_swag_offset(action, cpu_list_hookup));
return cpu;
state_initial = SURF_RESOURCE_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- current_property_set = xbt_dict_new();
cpu_im_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;
}
/* 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_im_t host = surf_model_resource_by_name(surf_cpu_model, elm);
+ cpu_Cas01_im_t host = surf_cpu_resource_by_name(elm);
xbt_assert1(host, "Host %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
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_im_t host = surf_model_resource_by_name(surf_cpu_model, elm);
+ cpu_Cas01_im_t host = surf_cpu_resource_by_name(elm);
xbt_assert1(host, "Host %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
static void cpu_im_define_callbacks(const char *file)
{
- surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
+ surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_im_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
&cpu_im_add_traces_cpu);
}
{
//defining the last timestamp that we can safely dump to trace file
//without losing the event ascending order (considering all CPU's)
+ void **data;
cpu_Cas01_im_t cpu;
xbt_dict_cursor_t cursor;
char *key;
double smaller = -1;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key, cpu){
- if (smaller < 0){
- smaller = cpu->last_update;
- continue;
- }
- if (cpu->last_update < smaller){
- smaller = cpu->last_update;
- }
- }
+ xbt_lib_foreach(host_lib, cursor, key, data){
+ if(data[SURF_CPU_LEVEL]){
+ cpu = data[SURF_CPU_LEVEL];
+ if (smaller < 0){
+ smaller = cpu->last_update;
+ continue;
+ }
+ if (cpu->last_update < smaller){
+ smaller = cpu->last_update;
+ }
+ }
+ }
if (smaller > 0) {
TRACE_last_timestamp_to_dump = smaller;
}
static void cpu_im_finalize(void)
{
- void *cpu;
- xbt_dict_cursor_t cursor;
+ void **cpu;
+ xbt_lib_cursor_t cursor;
char *key;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, key,
- cpu) {
- cpu_Cas01_im_t CPU = cpu;
- xbt_swag_free(CPU->action_set);
+
+ xbt_lib_foreach(host_lib, cursor, key, cpu){
+ if(cpu[SURF_CPU_LEVEL])
+ {
+ cpu_Cas01_im_t CPU = cpu[SURF_CPU_LEVEL];
+ xbt_swag_free(CPU->action_set);
+ }
}
lmm_system_free(cpu_im_maxmin_system);