A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Platform generation : add the Barabasi-Albert algorithm to build the graph
[simgrid.git]
/
src
/
surf
/
surfxml_parseplatf.c
diff --git
a/src/surf/surfxml_parseplatf.c
b/src/surf/surfxml_parseplatf.c
index
f04585d
..
9555060
100644
(file)
--- a/
src/surf/surfxml_parseplatf.c
+++ b/
src/surf/surfxml_parseplatf.c
@@
-75,7
+75,7
@@
static void parse_Etag_trace(void)
{
tmgr_trace_t trace;
if (!trace_file || strcmp(trace_file, "") != 0) {
- trace = tmgr_trace_new(trace_file);
+ trace = tmgr_trace_new
_from_file
(trace_file);
} else if (strcmp(surfxml_pcdata, "") == 0) {
trace = NULL;
} else {
@@
-102,25
+102,25
@@
static void parse_Stag_trace_connect(void)
case A_surfxml_trace_connect_kind_HOST_AVAIL:
xbt_dict_set(trace_connect_list_host_avail,
A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element),
free
);
+ xbt_strdup(A_surfxml_trace_connect_element),
NULL
);
break;
case A_surfxml_trace_connect_kind_POWER:
xbt_dict_set(trace_connect_list_power, A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element),
free
);
+ xbt_strdup(A_surfxml_trace_connect_element),
NULL
);
break;
case A_surfxml_trace_connect_kind_LINK_AVAIL:
xbt_dict_set(trace_connect_list_link_avail,
A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element),
free
);
+ xbt_strdup(A_surfxml_trace_connect_element),
NULL
);
break;
case A_surfxml_trace_connect_kind_BANDWIDTH:
xbt_dict_set(trace_connect_list_bandwidth,
A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element),
free
);
+ xbt_strdup(A_surfxml_trace_connect_element),
NULL
);
break;
case A_surfxml_trace_connect_kind_LATENCY:
xbt_dict_set(trace_connect_list_latency, A_surfxml_trace_connect_trace,
- xbt_strdup(A_surfxml_trace_connect_element),
free
);
+ xbt_strdup(A_surfxml_trace_connect_element),
NULL
);
break;
default:
xbt_die("Cannot connect trace %s to %s: kind of trace unknown",
@@
-137,7
+137,8
@@
void parse_platform_file(const char *file)
surf_parse_reset_callbacks();
/* Register classical callbacks */
- surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML);
+ surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
+ storage_register_callbacks();
routing_register_callbacks();
/* init the flex parser */
@@
-150,23
+151,18
@@
void parse_platform_file(const char *file)
if (!surfxml_bufferstack_stack)
surfxml_bufferstack_stack = xbt_dynar_new(sizeof(char *), NULL);
- traces_set_list = xbt_dict_new
(
);
- trace_connect_list_host_avail = xbt_dict_new
(
);
- trace_connect_list_power = xbt_dict_new
(
);
- trace_connect_list_link_avail = xbt_dict_new
(
);
- trace_connect_list_bandwidth = xbt_dict_new
(
);
- trace_connect_list_latency = xbt_dict_new
(
);
+ traces_set_list = xbt_dict_new
_homogeneous(NULL
);
+ trace_connect_list_host_avail = xbt_dict_new
_homogeneous(free
);
+ trace_connect_list_power = xbt_dict_new
_homogeneous(free
);
+ trace_connect_list_link_avail = xbt_dict_new
_homogeneous(free
);
+ trace_connect_list_bandwidth = xbt_dict_new
_homogeneous(free
);
+ trace_connect_list_latency = xbt_dict_new
_homogeneous(free
);
surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_Stag_trace);
surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_Etag_trace);
surfxml_add_callback(STag_surfxml_trace_connect_cb_list,
&parse_Stag_trace_connect);
- /* we care about the ASes while parsing the platf. Incredible, isnt it? */
- sg_platf_AS_end_add_cb(routing_AS_end);
- sg_platf_AS_begin_add_cb(routing_AS_begin);
-
-
/* Do the actual parsing */
parse_status = surf_parse();