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
Move e_surf_network_element_type_t public.
[simgrid.git]
/
src
/
surf
/
network_im.c
diff --git
a/src/surf/network_im.c
b/src/surf/network_im.c
index
08b26a6
..
82590fe
100644
(file)
--- a/
src/surf/network_im.c
+++ b/
src/surf/network_im.c
@@
-170,8
+170,7
@@
static link_CM02_im_t im_net_link_new(char *name,
state_initial, state_trace,
bw_initial, bw_trace);
state_initial, state_trace,
bw_initial, bw_trace);
- 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);
"Link '%s' declared several times in the platform file.",
name);
@@
-183,8
+182,7
@@
static link_CM02_im_t im_net_link_new(char *name,
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->lmm_resource.constraint);
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->lmm_resource.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;
return nw_link;
@@
-275,7
+273,7
@@
static void im_net_add_traces(void)
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_CM02_im_t link =
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_CM02_im_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_assert2(link, "Cannot connect trace %s to link %s: link undefined",
trace_name, elm);
xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
trace_name, elm);
@@
-290,7
+288,7
@@
static void im_net_add_traces(void)
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_CM02_im_t link =
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_CM02_im_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_assert2(link, "Cannot connect trace %s to link %s: link undefined",
trace_name, elm);
xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
trace_name, elm);
@@
-305,7
+303,7
@@
static void im_net_add_traces(void)
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_CM02_im_t link =
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_CM02_im_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_assert2(link, "Cannot connect trace %s to link %s: link undefined",
trace_name, elm);
xbt_assert2(link, "Cannot connect trace %s to link %s: link undefined",
trace_name, elm);
@@
-668,7
+666,7
@@
static surf_action_t im_net_communicate(const char *src_name,
/* LARGE PLATFORMS HACK:
total_route_size = route_size + src->link_nb + dst->nb */
/* LARGE PLATFORMS HACK:
total_route_size = route_size + src->link_nb + dst->nb */
- XBT_IN
_F
("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
+ XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
/* LARGE PLATFORMS HACK:
assert on total_route_size */
xbt_assert2(xbt_dynar_length(route),
/* LARGE PLATFORMS HACK:
assert on total_route_size */
xbt_assert2(xbt_dynar_length(route),
@@
-783,15
+781,13
@@
static surf_action_t im_net_communicate(const char *src_name,
/* LARGE PLATFORMS HACK:
expand also with src->link and dst->link */
#ifdef HAVE_TRACING
/* LARGE PLATFORMS HACK:
expand also with src->link and dst->link */
#ifdef HAVE_TRACING
- action->src_name = xbt_new(char, strlen(src_name) + 1);
- strncpy(action->src_name, src_name, strlen(src_name) + 1);
+ action->src_name = xbt_strdup(src_name);
- action->dst_name = xbt_new(char, strlen(dst_name) + 1);
- strncpy(action->dst_name, dst_name, strlen(dst_name) + 1);
+ action->dst_name = xbt_strdup(dst_name);
#endif
xbt_dynar_free(&route);
#endif
xbt_dynar_free(&route);
- XBT_OUT;
+ XBT_OUT
()
;
return (surf_action_t) action;
}
return (surf_action_t) action;
}