surf_parse_error(bprintf("%s is not an integer", string));
}
-void surf_parse_get_trace(tmgr_trace_t * trace, const char *string)
-{
- if ((!string) || (strcmp(string, "") == 0))
- *trace = NULL;
- else
- *trace = tmgr_trace_new(string);
-}
-
void parse_properties(void)
{
char *value = NULL;
char *src_host_name, *dst_host_name, *key, *src, *dst, *val, *key_w,
*data_w;
const char *sep = "#";
- xbt_dict_t set;
+ xbt_dict_t set = NULL;
xbt_dynar_t src_names = NULL, dst_names = NULL, links;
if (!route_multi_elements)
return;
- set = cpu_set;
- DEBUG1("%d", xbt_dict_length(workstation_set));
- if (workstation_set != NULL && xbt_dict_length(workstation_set) > 0)
- set = workstation_set;
+ if (surf_cpu_model)
+ set = surf_model_resource_set(surf_cpu_model);
+ if (surf_workstation_model != NULL &&
+ surf_model_resource_set(surf_workstation_model) != NULL &&
+ xbt_dict_length(surf_model_resource_set(surf_workstation_model)) > 0)
+ set = surf_model_resource_set(surf_workstation_model);
push_surfxml_bufferstack(0);
{
tmgr_trace_t trace;
if (!trace_file || strcmp(trace_file, "") != 0) {
- surf_parse_get_trace(&trace, trace_file);
+ trace = tmgr_trace_new(trace_file);
} else {
if (strcmp(surfxml_pcdata, "") == 0)
trace = NULL;