X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0cbf8403268f79ade344b60161f2f44b3ab2b81c..8cc10e99f53995bc7486e4467b4e6ad8d7be3460:/src/surf/surf_routing_cluster.c diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c index d0f6cd1161..d4f3fbdf7e 100644 --- a/src/surf/surf_routing_cluster.c +++ b/src/surf/surf_routing_cluster.c @@ -7,10 +7,6 @@ /* Global vars */ extern routing_global_t global_routing; -extern routing_component_t current_routing; -extern model_type_t current_routing_model; -extern xbt_dynar_t link_list; -extern xbt_dict_t cluster_host_link; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); @@ -18,11 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf" * Note that a router is created, easing the interconnexion with the rest of the world. */ -typedef struct { - s_routing_component_t generic_routing; - xbt_dict_t dict_processing_units; - xbt_dict_t dict_autonomous_systems; -} s_routing_component_cluster_t, *routing_component_cluster_t; +static xbt_dict_t cluster_host_link = NULL; /* for tag cluster */ /* Business methods */ static route_extended_t cluster_get_route(routing_component_t rc, @@ -50,10 +42,17 @@ static route_extended_t cluster_get_route(routing_component_t rc, } /* Creation routing model functions */ -void *model_cluster_create(void) +routing_component_t model_cluster_create(void) { - routing_component_cluster_t new_component = model_rulebased_create(); - new_component->generic_routing.get_route = cluster_get_route; + routing_component_t new_component = model_none_create(); + new_component->get_route = cluster_get_route; - return new_component; + return (routing_component_t) new_component; +} + +void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info) { + if(!cluster_host_link) + cluster_host_link = xbt_dict_new(); + + xbt_dict_set(cluster_host_link,host_id,info,xbt_free); }