} e_routing_types;
struct s_model_type routing_models[] = {
- {"Full",
- "Full routing data (fast, large memory requirements, fully expressive)",
- model_full_create},
- {"Floyd",
- "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
- model_floyd_create},
- {"Dijkstra",
- "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
- model_dijkstra_create},
- {"DijkstraCache",
- "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
- model_dijkstracache_create},
- {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).",
- model_none_create},
- {"Vivaldi", "Vivaldi routing", model_vivaldi_create},
- {"Cluster", "Cluster routing", model_cluster_create},
- {"Torus_Cluster", "Torus Cluster routing", model_torus_cluster_create},
- {"Fat_Tree_Cluster", "Fat Tree Cluster routing", model_fat_tree_cluster_create},
- {NULL, NULL, NULL}
+ {model_full_create},
+ {model_floyd_create},
+ {model_dijkstra_create},
+ {model_dijkstracache_create},
+ {model_none_create},
+ {model_vivaldi_create},
+ {model_cluster_create},
+ {model_torus_cluster_create},
+ {model_fat_tree_cluster_create},
+ {NULL}
};
-/**
- * \brief Add a netcard connecting an host to the network element list
- * FIXME: integrate into host constructor
- */
-void sg_platf_new_netcard(sg_platf_host_link_cbarg_t netcard)
+/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */
+void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t netcard_arg)
{
- simgrid::surf::NetCard *info = sg_host_by_name(netcard->id)->pimpl_netcard;
- xbt_assert(info, "Host '%s' not found!", netcard->id);
+ simgrid::surf::NetCard *netcard = sg_host_by_name(netcard_arg->id)->pimpl_netcard;
+ xbt_assert(netcard, "Host '%s' not found!", netcard_arg->id);
xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER] ||
current_routing->p_modelDesc == &routing_models[SURF_MODEL_VIVALDI],
"You have to be in model Cluster to use tag host_link!");
s_surf_parsing_link_up_down_t link_up_down;
- link_up_down.link_up = Link::byName(netcard->link_up);
- link_up_down.link_down = Link::byName(netcard->link_down);
+ link_up_down.link_up = Link::byName(netcard_arg->link_up);
+ link_up_down.link_down = Link::byName(netcard_arg->link_down);
- xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard->link_up);
- xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard->link_down);
-
- if(!current_routing->p_linkUpDownList)
- current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
+ xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard_arg->link_up);
+ xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard_arg->link_down);
// If dynar is is greater than netcard id and if the host_link is already defined
- if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() &&
- xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*))
- surf_parse_error("Host_link for '%s' is already defined!",netcard->id);
+ if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > netcard->getId() &&
+ xbt_dynar_get_as(current_routing->p_linkUpDownList, netcard->getId(), void*))
+ surf_parse_error("Host_link for '%s' is already defined!",netcard_arg->id);
- XBT_DEBUG("Push Host_link for host '%s' to position %d", info->getName(), info->getId());
- xbt_dynar_set_as(current_routing->p_linkUpDownList, info->getId(), s_surf_parsing_link_up_down_t, link_up_down);
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->getName(), netcard->getId());
+ xbt_dynar_set_as(current_routing->p_linkUpDownList, netcard->getId(), s_surf_parsing_link_up_down_t, link_up_down);
}
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
/* search the routing model */
switch(AS->routing){
case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
- case A_surfxml_AS_routing_Cluster___torus: model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break;
- case A_surfxml_AS_routing_Cluster___fat___tree: model = &routing_models[SURF_MODEL_FAT_TREE_CLUSTER];break;
+ case A_surfxml_AS_routing_ClusterTorus: model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break;
+ case A_surfxml_AS_routing_ClusterFatTree: model = &routing_models[SURF_MODEL_FAT_TREE_CLUSTER];break;
case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break;
case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break;
new_as->p_hierarchy = SURF_ROUTING_NULL;
new_as->p_name = xbt_strdup(AS->id);
- simgrid::surf::NetCard *info =
- new simgrid::surf::NetCardImpl(xbt_strdup(new_as->p_name),
- -1,
- SURF_NETWORK_ELEMENT_AS,
- current_routing);
+ simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->p_name, SURF_NETWORK_ELEMENT_AS, current_routing);
if (current_routing == NULL && routing_platf->p_root == NULL) {
/* it is the first one */
new_as->p_routingFather = NULL;
routing_platf->p_root = new_as;
- info->setId(-1);
+ netcard->setId(-1);
} else if (current_routing != NULL && routing_platf->p_root != NULL) {
xbt_assert(!xbt_dict_get_or_null
xbt_dict_set(current_routing->p_routingSons, AS->id,
(void *) new_as, NULL);
/* add to the father element list */
- info->setId(current_routing->parseAS(info));
+ netcard->setId(current_routing->parseAS(netcard));
} else {
THROWF(arg_error, 0, "All defined components must belong to a AS");
}
- xbt_lib_set(as_router_lib, info->getName(), ROUTING_ASR_LEVEL,
- (void *) info);
- XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, info->getId());
+ xbt_lib_set(as_router_lib, netcard->getName(), ROUTING_ASR_LEVEL,
+ (void *) netcard);
+ XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, netcard->getId());
/* set the new current component of the tree */
current_routing = new_as;
- current_routing->p_netcard = info;
+ current_routing->p_netcard = netcard;
- simgrid::surf::netcardCreatedCallbacks(info);
+ simgrid::surf::netcardCreatedCallbacks(netcard);
simgrid::surf::asCreatedCallbacks(new_as);
}
host_link.id = host_id;
host_link.link_up = link_up;
host_link.link_down = link_down;
- sg_platf_new_netcard(&host_link);
+ sg_platf_new_hostlink(&host_link);
free(host_id);
free(link_id);
AS.routing = A_surfxml_AS_routing_Cluster;
sg_platf_new_AS_begin(&AS);
- current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
-
XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\"/>", host_id, peer->speed);
s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER;
memset(&host, 0, sizeof(host));
host_link.id = host_id;
host_link.link_up = link_up;
host_link.link_down = link_down;
- sg_platf_new_netcard(&host_link);
+ sg_platf_new_hostlink(&host_link);
XBT_DEBUG("<router id=\"%s\"/>", router_id);
s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
return as->p_routingSons;
}
-const char *surf_AS_get_model(simgrid::surf::As *as)
-{
- return as->p_modelDesc->name;
-}
-
xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)
{
xbt_dynar_t elms = as->p_indexNetworkElm;
