xbt_dict_t cpu_properties)
{
cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
- xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name),
+ xbt_assert1(!surf_workstation_resource_by_name(name),
"Host '%s' declared several times in the platform file.",
name);
cpu->generic_resource.model = surf_workstation_model;
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
cpu->generic_resource.name = xbt_strdup(name);
- cpu->generic_resource.properties = current_property_set;
+ cpu->generic_resource.properties = cpu_properties;
cpu->id = ptask_host_count++;
cpu->power_scale = power_scale;
lmm_constraint_new(ptask_maxmin_system, cpu,
cpu->power_current * cpu->power_scale);
- xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu,
- surf_resource_free);
+ xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, cpu);
return cpu;
}
state_initial = SURF_RESOURCE_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- current_property_set = xbt_dict_new();
ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
state_initial, state_trace, current_property_set);
+ current_property_set=NULL;
}
static void ptask_cpu_create_resource(char *name, double power_peak,
policy, xbt_dict_t properties)
{
link_L07_t nw_link = xbt_new0(s_link_L07_t, 1);
- xbt_assert1(!xbt_dict_get_or_null
- (surf_network_model->resource_set, name),
+ xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
"Link '%s' declared several times in the platform file.",
name);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
- xbt_dict_set(surf_network_model->resource_set, name, nw_link,
- surf_resource_free);
-
-
+ xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link);
return nw_link;
}
state_trace = tmgr_trace_new(A_surfxml_link_state_file);
- current_property_set = xbt_dict_new();
-
if(policy_initial_link == SURF_LINK_FULLDUPLEX)
{
ptask_link_new(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace,
current_property_set);
ptask_link_new(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace,
state_initial_link, state_trace, policy_initial_link,
- xbt_dict_new());
+ current_property_set);
}
else
{
state_initial_link, state_trace, policy_initial_link,
current_property_set);
}
+ current_property_set = NULL;
}
static void ptask_link_create_resource(char *name,
e_surf_link_sharing_policy_t
policy, xbt_dict_t properties)
{
-
ptask_link_new(name, bw_initial, bw_trace,
lat_initial, lat_trace, state_initial, state_trace,
- policy, xbt_dict_new());
+ policy, properties);
}
/* Connect traces relative to cpu */
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_L07_t host =
- surf_model_resource_by_name(surf_workstation_model, elm);
+ cpu_L07_t host = surf_workstation_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_L07_t host =
- surf_model_resource_by_name(surf_workstation_model, elm);
+ cpu_L07_t host = surf_workstation_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_link_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
link_L07_t link =
- xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
xbt_assert1(link, "Link %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
link_L07_t link =
- xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
xbt_assert1(link, "Link %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
link_L07_t link =
- xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
xbt_assert1(link, "Link %s undefined", elm);
xbt_assert1(trace, "Trace %s undefined", trace_name);
static void ptask_define_callbacks(const char *file)
{
/* Adding callback functions */
- surfxml_add_callback(STag_surfxml_host_cb_list, &ptask_parse_cpu_init);
- surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init);
+ surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init);
+ surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
}