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
Change those functions to public for use external parser.
[simgrid.git]
/
src
/
surf
/
network_gtnets.c
diff --git
a/src/surf/network_gtnets.c
b/src/surf/network_gtnets.c
index
b33e07d
..
c317017
100644
(file)
--- a/
src/surf/network_gtnets.c
+++ b/
src/surf/network_gtnets.c
@@
-22,28
+22,13
@@
static void link_new(char *name, double bw, double lat, xbt_dict_t props)
{
static int link_count = -1;
network_link_GTNETS_t gtnets_link;
- network_link_GTNETS_t gtnets_link_friend;
- int tmp_idsrc = -1;
- int tmp_iddst = -1;
- char *name_friend;
if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) {
return;
}
-#ifdef HAVE_TRACING
- TRACE_surf_link_declaration(name, bw, lat);
-#endif
-
- DEBUG1("Scanning link name %s", name);
- sscanf(name, "%d_%d", &tmp_idsrc, &tmp_iddst);
- DEBUG2("Link name split into %d and %d", tmp_idsrc, tmp_iddst);
- xbt_assert0((tmp_idsrc != -1)
- && (tmp_idsrc != -1),
- "You need to respect fullduplex convention x_y for xml link id.");
+ XBT_DEBUG("Scanning link name %s", name);
- name_friend = (char *) calloc(strlen(name), sizeof(char));
- sprintf(name_friend, "%d_%d", tmp_iddst, tmp_idsrc);
gtnets_link = xbt_new0(s_network_link_GTNETS_t, 1);
gtnets_link->generic_resource.name = name;
@@
-51,20
+36,16
@@
static void link_new(char *name, double bw, double lat, xbt_dict_t props)
gtnets_link->bw_current = bw;
gtnets_link->lat_current = lat;
- if ((gtnets_link_friend =
- xbt_dict_get_or_null(surf_network_model->resource_set,
- name_friend))) {
- gtnets_link->id = gtnets_link_friend->id;
- } else {
- link_count++;
+ link_count++;
-
DEBUG4
("Adding new link, linkid %d, name %s, latency %g, bandwidth %g",
+
XBT_DEBUG
("Adding new link, linkid %d, name %s, latency %g, bandwidth %g",
link_count, name, lat, bw);
- if (gtnets_add_link(link_count, bw, lat)) {
- xbt_assert0(0, "Cannot create GTNetS link");
- }
- gtnets_link->id = link_count;
+
+ if (gtnets_add_link(link_count, bw, lat)) {
+ xbt_die("Cannot create GTNetS link");
}
+ gtnets_link->id = link_count;
+
xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
surf_resource_free);
}
@@
-77,7
+58,7
@@
static void route_new(int src_id, int dst_id, xbt_dynar_t links,
int i = 0;
int *gtnets_links;
- XBT_IN
4
("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
+ XBT_IN("(src_id=%d, dst_id=%d, links=%p, nb_link=%d)",
src_id, dst_id, links, nb_link);
/* Build the list of gtnets link IDs */
@@
-88,16
+69,16
@@
static void route_new(int src_id, int dst_id, xbt_dynar_t links,
}
if (gtnets_add_route(src_id, dst_id, gtnets_links, nb_link)) {
- xbt_
assert0(0,
"Cannot create GTNetS route");
+ xbt_
die(
"Cannot create GTNetS route");
}
- XBT_OUT;
+ XBT_OUT
()
;
}
static void route_onehop_new(int src_id, int dst_id,
network_link_GTNETS_t link)
{
if (gtnets_add_onehop_route(src_id, dst_id, link->id)) {
- xbt_
assert0(0,
"Cannot create GTNetS route");
+ xbt_
die(
"Cannot create GTNetS route");
}
}
@@
-108,12
+89,11
@@
static void parse_link_init(void)
double bw;
double lat;
e_surf_resource_state_t state;
-
name = xbt_strdup(A_surfxml_link_id);
surf_parse_get_double(&bw, A_surfxml_link_bandwidth);
surf_parse_get_double(&lat, A_surfxml_link_latency);
state = SURF_RESOURCE_ON;
-
+ XBT_DEBUG("link_gtnets");
tmgr_trace_t bw_trace;
tmgr_trace_t state_trace;
tmgr_trace_t lat_trace;
@@
-123,63
+103,78
@@
static void parse_link_init(void)
state_trace = tmgr_trace_new(A_surfxml_link_state_file);
if (bw_trace)
- INFO0
+ XBT_INFO
("The GTNetS network model doesn't support bandwidth state traces");
if (lat_trace)
-
INFO0
("The GTNetS network model doesn't support latency state traces");
+
XBT_INFO
("The GTNetS network model doesn't support latency state traces");
if (state_trace)
- INFO0("The GTNetS network model doesn't support link state traces");
+ XBT_INFO("The GTNetS network model doesn't support link state traces");
+
+ if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+ {
+ link_new(bprintf("%s_UP",name), bw, lat, current_property_set);
+ link_new(bprintf("%s_DOWN",name), bw, lat, current_property_set);
- current_property_set = xbt_dict_new();
- link_new(name, bw, lat, current_property_set);
+ }
+ else link_new(name, bw, lat, current_property_set);
+ current_property_set = NULL;
}
/* Create the gtnets topology based on routing strategy */
static void create_gtnets_topology()
{
-// xbt_dict_cursor_t cursor = NULL;
-// char *key, *data;
-// xbt_dict_t onelink_routes = global_routing->get_onelink_routes();
-// xbt_assert0(onelink_routes, "Error onelink_routes was not initialized");
-//
-// DEBUG0("Starting topology generation");
+ int src_id,dst_id;
+
+ XBT_DEBUG("Starting topology generation");
// À refaire plus tard. Il faut prendre la liste des hôtes/routeurs (dans routing)
// À partir de cette liste, on les numérote.
// Ensuite, on peut utiliser les id pour refaire les appels GTNets qui suivent.
-// xbt_dict_foreach(onelink_routes, cursor, key, data){
-// s_onelink_t link = (s_onelink_t) data;
-//
-// DEBUG3("Link (#%d), src (#%s), dst (#%s)", ((network_link_GTNETS_t)(link->link_ptr))->id , link->src, link->dst);
-// DEBUG0("Calling one link route");
-// if(global_routing->is_router(link->src)){
-// gtnets_add_router(link->src_id);
-// }
-// if(global_routing->is_router(link->dst)){
-// gtnets_add_router(link->dst_id);
-// }
-// route_onehop_new(link->src_id, link->dst_id, (network_link_GTNETS_t)(link->link_ptr));
-// }
-//
-// xbt_dict_free(&route_table);
-// if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
-// gtnets_print_topology();
-// }
+ //get the onelinks from the parsed platform
+ xbt_dynar_t onelink_routes = global_routing->get_onelink_routes();
+ if (!onelink_routes)
+ return;
+
+ //save them in trace file
+ onelink_t onelink;
+ unsigned int iter;
+ xbt_dynar_foreach(onelink_routes, iter, onelink) {
+ char *src = onelink->src;
+ char *dst = onelink->dst;
+ void *link = onelink->link_ptr;
+ src_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src));
+ dst_id = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst));
+
+ if(src_id != dst_id){
+ XBT_DEBUG("Link (#%p), src (#%s), dst (#%s), src_id = %d, dst_id = %d", link,src,dst, src_id, dst_id);
+ XBT_DEBUG("Calling one link route");
+ if(global_routing->get_network_element_type(src) == SURF_NETWORK_ELEMENT_ROUTER){
+ gtnets_add_router(src_id);
+ }
+ if(global_routing->get_network_element_type(dst) == SURF_NETWORK_ELEMENT_ROUTER){
+ gtnets_add_router(dst_id);
+ }
+ route_onehop_new(src_id, dst_id, (network_link_GTNETS_t)(link));
+ }
+ }
+
+ if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
+ gtnets_print_topology();
+ }
}
/* Main XML parsing */
static void define_callbacks(const char *file)
{
/* Figuring out the network links */
- surfxml_add_callback(
S
Tag_surfxml_link_cb_list, &parse_link_init);
+ surfxml_add_callback(
E
Tag_surfxml_link_cb_list, &parse_link_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
&create_gtnets_topology);
}
static int resource_used(void *resource_id)
{
- xbt_assert0(0,
- "The resource_used feature is not implemented in GTNets model");
+ xbt_die("The resource_used feature is not implemented in GTNets model");
}
static int action_unref(surf_action_t action)
@@
-191,7
+186,7
@@
static int action_unref(surf_action_t action)
if (action->category)
xbt_free(action->category);
#endif
-
free(
action);
+
surf_action_free(&
action);
return 1;
}
return 0;
@@
-199,13
+194,13
@@
static int action_unref(surf_action_t action)
static void action_cancel(surf_action_t action)
{
- xbt_
assert0(0,
"Cannot cancel GTNetS flow");
+ xbt_
die(
"Cannot cancel GTNetS flow");
return;
}
static void action_recycle(surf_action_t action)
{
- xbt_
assert0(0,
"Cannot recycle GTNetS flow");
+ xbt_
die(
"Cannot recycle GTNetS flow");
return;
}
@@
-232,9
+227,9
@@
static double share_resources(double now)
xbt_assert0(time_to_next_flow_completion,
"Time to next flow completion not initialized!\n");
-
DEBUG0
("Calling gtnets_get_time_to_next_flow_completion");
+
XBT_DEBUG
("Calling gtnets_get_time_to_next_flow_completion");
time_to_next_flow_completion = gtnets_get_time_to_next_flow_completion();
-
DEBUG1
("gtnets_get_time_to_next_flow_completion received %lg",
+
XBT_DEBUG
("gtnets_get_time_to_next_flow_completion received %lg",
time_to_next_flow_completion);
return time_to_next_flow_completion;
@@
-259,16
+254,14
@@
static void update_actions_state(double now, double delta)
num_flows = 0;
if (gtnets_run_until_next_flow_completion(&metadata, &num_flows)) {
- xbt_assert0(0,
- "Cannot run GTNetS simulation until next flow completion");
+ xbt_die("Cannot run GTNetS simulation until next flow completion");
}
if (num_flows < 1) {
- xbt_assert0(0,
- "GTNetS simulation couldn't find a flow that would complete");
+ xbt_die("GTNetS simulation couldn't find a flow that would complete");
}
xbt_swag_foreach(action, running_actions) {
-
DEBUG2
("Action (%p) remains old value: %f", action,
+
XBT_DEBUG
("Action (%p) remains old value: %f", action,
action->generic_action.remains);
double sent = gtnets_get_flow_rx(action);
@@
-293,7
+286,7
@@
static void update_actions_state(double now, double delta)
// }
#endif
-
DEBUG1
("Sent value returned by GTNetS : %f", sent);
+
XBT_DEBUG
("Sent value returned by GTNetS : %f", sent);
//need to trust this remain value
if (sent == 0) {
action->generic_action.remains = 0;
@@
-301,7
+294,7
@@
static void update_actions_state(double now, double delta)
action->generic_action.remains =
action->generic_action.cost - sent;
}
-
DEBUG2
("Action (%p) remains new value: %f", action,
+
XBT_DEBUG
("Action (%p) remains new value: %f", action,
action->generic_action.remains);
}
@@
-313,13
+306,13
@@
static void update_actions_state(double now, double delta)
TRACE_surf_gtnets_destroy(action);
#endif
action_state_set((surf_action_t) action, SURF_ACTION_DONE);
-
DEBUG1
("----> Action (%p) just terminated", action);
+
XBT_DEBUG
("----> Action (%p) just terminated", action);
}
} else { /* run for a given number of seconds */
if (gtnets_run(delta)) {
- xbt_
assert0(0,
"Cannot run GTNetS simulation");
+ xbt_
die(
"Cannot run GTNetS simulation");
}
}
@@
-330,7
+323,7
@@
static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
double value, double date)
{
- xbt_
assert0(0,
"Cannot update model state for GTNetS simulation");
+ xbt_
die(
"Cannot update model state for GTNetS simulation");
}
/* Max durations are not supported */
@@
-344,10
+337,12
@@
static surf_action_t communicate(const char *src_name,
src = dst = -1;
surf_action_network_GTNETS_t action = NULL;
+ src = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,src_name));
+ dst = *((int *) xbt_dict_get_or_null(global_routing->root->to_index,dst_name));
xbt_assert0((src >= 0
&& dst >= 0), "Either src or dst have invalid id (id<0)");
-
DEBUG4
("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
+
XBT_DEBUG
("Setting flow src %d \"%s\", dst %d \"%s\"", src, src_name, dst,
dst_name);
xbt_dynar_t links = global_routing->get_route(src_name, dst_name);
@@
-359,8
+354,7
@@
static surf_action_t communicate(const char *src_name,
/* Add a flow to the GTNets Simulation, associated to this action */
if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {
- xbt_assert2(0, "Not route between host %s and host %s", src_name,
- dst_name);
+ xbt_die("Not route between host %s and host %s", src_name, dst_name);
}
#ifdef HAVE_TRACING
TRACE_surf_gtnets_communicate(action, src, dst);
@@
-419,10
+413,10
@@
static void surf_network_model_init_internal(void)
/* Added the initialization for GTNetS interface */
if (gtnets_initialize(sg_tcp_gamma)) {
- xbt_
assert0(0,
"Impossible to initialize GTNetS interface");
+ xbt_
die(
"Impossible to initialize GTNetS interface");
}
- routing_model_create(sizeof(network_link_GTNETS_t), NULL);
+ routing_model_create(sizeof(network_link_GTNETS_t), NULL
, NULL
);
}
#ifdef HAVE_LATENCY_BOUND_TRACKING