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.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
3c50adc
..
b07cd75
100644
(file)
--- a/
src/surf/network.c
+++ b/
src/surf/network.c
@@
-173,8
+173,7
@@
static link_CM02_t 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);
@@
-186,8
+185,7
@@
static link_CM02_t 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;
}
@@
-202,7
+200,7
@@
static void net_parse_link_init(void)
e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
tmgr_trace_t state_trace;
e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
tmgr_trace_t state_trace;
-
DEBUG0
("link_CM02");
+
XBT_DEBUG
("link_CM02");
name_link = xbt_strdup(A_surfxml_link_id);
surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
name_link = xbt_strdup(A_surfxml_link_id);
surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
@@
-277,7
+275,7
@@
static void 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_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_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);
@@
-292,7
+290,7
@@
static void 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_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_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);
@@
-307,7
+305,7
@@
static void 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_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_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);
@@
-347,7
+345,7
@@
static int net_action_unref(surf_action_t action)
if (action->category)
xbt_free(action->category);
#endif
if (action->category)
xbt_free(action->category);
#endif
-
free(
action);
+
surf_action_free(&
action);
return 1;
}
return 0;
return 1;
}
return 0;
@@
-407,6
+405,8
@@
static double net_share_resources(double now)
}
}
}
}
+ XBT_DEBUG("Min of share resources %f", min);
+
return min;
}
return min;
}
@@
-506,7
+506,7
@@
static void net_update_resource_state(void *id,
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
#ifdef HAVE_TRACING
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
#ifdef HAVE_TRACING
- TRACE_surf_link_set_bandwidth(date, nw_link,
+ TRACE_surf_link_set_bandwidth(date, nw_link
->lmm_resource.generic_resource.name
,
sg_bandwidth_factor *
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
sg_bandwidth_factor *
(nw_link->lmm_resource.power.peak *
nw_link->lmm_resource.power.scale));
@@
-548,9
+548,9
@@
static void net_update_resource_state(void *id,
action->lat_current)));
if (action->rate < sg_tcp_gamma / (2.0 * action->lat_current)) {
action->lat_current)));
if (action->rate < sg_tcp_gamma / (2.0 * action->lat_current)) {
-
INFO0
("Flow is limited BYBANDWIDTH");
+
XBT_INFO
("Flow is limited BYBANDWIDTH");
} else {
} else {
-
INFO1
("Flow is limited BYLATENCY, latency of flow is %f",
+
XBT_INFO
("Flow is limited BYLATENCY, latency of flow is %f",
action->lat_current);
}
}
action->lat_current);
}
}
@@
-584,7
+584,7
@@
static void net_update_resource_state(void *id,
if (tmgr_trace_event_free(event_type))
nw_link->lmm_resource.state_event = NULL;
} else {
if (tmgr_trace_event_free(event_type))
nw_link->lmm_resource.state_event = NULL;
} else {
-
CRITICAL0
("Unknown event ! \n");
+
XBT_CRITICAL
("Unknown event ! \n");
xbt_abort();
}
xbt_abort();
}
@@
-619,7
+619,7
@@
static surf_action_t 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
4
("(%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 */
latency = global_routing->get_latency(src_name,dst_name);
/* LARGE PLATFORMS HACK:
assert on total_route_size */
latency = global_routing->get_latency(src_name,dst_name);
@@
-672,7
+672,7
@@
static surf_action_t net_communicate(const char *src_name,
if(xbt_dynar_length(route) > 0) {
link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0);
gap_append(size, link, action);
if(xbt_dynar_length(route) > 0) {
link = *(link_CM02_t*)xbt_dynar_get_ptr(route, 0);
gap_append(size, link, action);
-
DEBUG5
("Comm %p: %s -> %s gap=%f (lat=%f)",
+
XBT_DEBUG
("Comm %p: %s -> %s gap=%f (lat=%f)",
action, src_name, dst_name, action->sender.gap, action->latency);
} else {
gap_unknown(action);
action, src_name, dst_name, action->sender.gap, action->latency);
} else {
gap_unknown(action);
@@
-722,7
+722,7
@@
static surf_action_t net_communicate(const char *src_name,
}
if (sg_network_fullduplex == 1) {
}
if (sg_network_fullduplex == 1) {
-
DEBUG1
("Fullduplex active adding backward flow using 5%c", '%');
+
XBT_DEBUG
("Fullduplex active adding backward flow using 5%c", '%');
xbt_dynar_foreach(back_route, i, link) {
lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
action->variable, .05);
xbt_dynar_foreach(back_route, i, link) {
lmm_expand(network_maxmin_system, link->lmm_resource.constraint,
action->variable, .05);
@@
-731,15
+731,13
@@
static surf_action_t 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;
}