static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked =
NULL;
-static void* cpu_create_resource(char *name, double power_peak,
+static void* cpu_create_resource(const char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
xbt_dict_t cpu_properties)
{
- cpu_Cas01_t cpu = xbt_new0(s_cpu_Cas01_t, 1);
+ cpu_Cas01_t cpu = NULL;
xbt_assert(!surf_cpu_resource_by_name(name),
"Host '%s' declared several times in the platform file",
name);
- cpu->generic_resource.model = surf_cpu_model;
- cpu->generic_resource.name = name;
- cpu->generic_resource.properties = cpu_properties;
+ cpu = (cpu_Cas01_t) surf_resource_new(sizeof(s_cpu_Cas01_t),
+ surf_cpu_model, name,cpu_properties);
cpu->power_peak = power_peak;
xbt_assert(cpu->power_peak > 0, "Power has to be >0");
cpu->power_scale = power_scale;
}
-static void parse_cpu_init(void)
+static void parse_cpu_init(surf_parsing_host_arg_t host)
{
- if(strcmp(struct_host->V_host_coord,"")) xbt_die("Coordinates not implemented yet!");
-
- cpu_create_resource(struct_host->V_host_id,
- struct_host->V_host_power_peak,
- struct_host->V_host_power_scale,
- struct_host->V_host_power_trace,
- struct_host->V_host_core,
- struct_host->V_host_state_initial,
- struct_host->V_host_state_trace,
+ if(strcmp(host->V_host_coord,"")) xbt_die("Coordinates not implemented yet!");
+
+ cpu_create_resource(host->V_host_id,
+ host->V_host_power_peak,
+ host->V_host_power_scale,
+ host->V_host_power_trace,
+ host->V_host_core,
+ host->V_host_state_initial,
+ host->V_host_state_trace,
current_property_set);
current_property_set = NULL;
}
}
}
-static void cpu_define_callbacks(const char *file)
+static void cpu_define_callbacks(void)
{
- surfxml_add_callback(ETag_surfxml_host_cb_list, parse_cpu_init);
+ surf_parse_host_add_cb(parse_cpu_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces_cpu);
}
/* note = "Available at */
/* \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
/* } */
-void surf_cpu_model_init_Cas01(const char *filename)
+void surf_cpu_model_init_Cas01()
{
if (surf_cpu_model)
return;
surf_cpu_model_init_internal();
- cpu_define_callbacks(filename);
+ cpu_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
}