X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83b6eb642c9777ecc8f947d1a645cbec1874173b..1d558deeec797460abbfa5ed52f1e7ae784dcf7e:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index af28025a48..be05319174 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -47,11 +47,10 @@ static const char *dst = NULL;        /* temporary store the destination name of
 static char *gw_src = NULL;     /* temporary store the gateway source name of a route */
 static char *gw_dst = NULL;     /* temporary store the gateway destination name of a route */
 static double_f_cpvoid_t get_link_latency = NULL;
-xbt_dict_t cluster_host_link = NULL; /* for tag cluster */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
 
-static void routing_parse_Speer(void);          /* peer bypass */
+static void routing_parse_Speer(sg_platf_peer_cbarg_t peer);          /* peer bypass */
 static void routing_parse_Srandom(void);        /* random bypass */
 
 static char* replace_random_parameter(char * chaine);
@@ -94,7 +93,7 @@ struct s_model_type routing_models[] = { {"Full",
 {"Vivaldi", "Vivaldi routing", model_vivaldi_create,
   model_none_load, model_none_unload, model_none_end},
 {"Cluster", "Cluster routing", model_cluster_create,
-  model_none_load, model_none_unload, model_none_end},
+  model_none_load, model_cluster_unload, model_none_end},
 {NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -152,17 +151,6 @@ static void parse_S_router(sg_platf_router_cbarg_t router)
   }
 }
 
-/**
- * brief Add a "router" to the network element list from XML description
- */
-static void parse_S_router_lua(const char* router_id) {
-  s_sg_platf_router_cbarg_t router;
-  memset(&router,0,sizeof(router));
-	router.id = router_id;
-	router.coord = "";
-	return parse_S_router(&router);
-}
-
 /**
  * \brief Set the endponints for a route
  */
@@ -188,14 +176,6 @@ static void parse_S_route_new_and_endpoints_XML(void)
                                   A_surfxml_route_dst);
 }
 
-/**
- * \brief Set the endpoints for a route from lua
- */
-static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
-{
-  parse_S_route_new_and_endpoints(id_src, id_dst);
-}
-
 /**
  * \brief Set the endponints and gateways for a ASroute
  */
@@ -265,14 +245,6 @@ static void parse_E_link_ctn_new_elem_XML(void)
   }
 }
 
-/**
- * \brief Set a new link on the actual list of link for a route or ASroute from lua
- */
-static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
-{
-  parse_E_link_ctn_new_elem(link_id);
-}
-
 /**
  * \brief Store the route by calling the set_route function of the current routing component
  */
@@ -340,10 +312,10 @@ static void parse_E_bypassRoute_store_route(void)
  * Once this function was called, the configuration concerning the used
  * models cannot be changed anymore.
  *
- * @param AS_id name of this autonomous system. Must be uniq in the platform
+ * @param AS_id name of this autonomous system. Must be unique in the platform
  * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
  */
-void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type)
+void routing_AS_open(const char *AS_id, const char *wanted_routing_type)
 {
   routing_component_t new_routing;
   model_type_t model = NULL;
@@ -416,7 +388,7 @@ void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type)
  * even if you add stuff to a closed AS
  *
  */
-void sg_platf_new_AS_close() {
+void routing_AS_close() {
 
   if (current_routing == NULL) {
     THROWF(arg_error, 0, "Close an AS, but none was under construction");
@@ -791,7 +763,7 @@ static void _finalize(routing_component_t rc)
  */
 static void finalize(void)
 {
-  /* delete recursibly all the tree */
+  /* delete recursively all the tree */
   _finalize(global_routing->root);
   /* delete last_route */
   xbt_dynar_free(&(global_routing->last_route));
@@ -897,9 +869,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_
   surfxml_add_callback(STag_surfxml_cluster_cb_list,
                        &routing_parse_Scluster);
 
-  surfxml_add_callback(STag_surfxml_peer_cb_list,
-                         &routing_parse_Speer);
-
+  sg_platf_peer_add_cb(routing_parse_Speer); // FIXME: inline in the sg_platf_new_peer instead
   sg_platf_postparse_add_cb(clean_routing_after_parse);
 
 #ifdef HAVE_TRACING
@@ -1376,9 +1346,6 @@ void generic_src_dst_check(routing_component_t rc, const char *src,
 
 void routing_parse_Scluster(void)
 {
-  if(!cluster_host_link)
-	  cluster_host_link = xbt_dict_new();
-
   static int AX_ptr = 0;
   char *host_id, *groups, *link_id = NULL;
 
@@ -1458,12 +1425,6 @@ void routing_parse_Scluster(void)
 		XBT_DEBUG("</host>");
 
 
-		A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-		if(struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-		{A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
-		if(struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
-		{A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-
 		XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->bw, struct_cluster->lat);
 
 		memset(&link,0,sizeof(link));
@@ -1472,24 +1433,21 @@ void routing_parse_Scluster(void)
 		link.latency = struct_cluster->lat;
 		link.state = SURF_RESOURCE_ON;
 
-		switch (A_surfxml_link_sharing_policy) {
-		case A_surfxml_link_sharing_policy_SHARED:
-			link.policy = SURF_LINK_SHARED;
-			break;
-		case A_surfxml_link_sharing_policy_FATPIPE:
+		switch (struct_cluster->sharing_policy) {
+		case A_surfxml_cluster_sharing_policy_FATPIPE:
 		  link.policy = SURF_LINK_FATPIPE;
 		  break;
-		case A_surfxml_link_sharing_policy_FULLDUPLEX:
+		case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
 		  link.policy = SURF_LINK_FULLDUPLEX;
 		  break;
-		case AU_surfxml_link_sharing_policy:
-		  surf_parse_error(bprintf("Invalid sharing policy in cluster %s (please report this bug, this shouldn't happen)",struct_cluster->id));
+		default:
+      link.policy = SURF_LINK_SHARED;
 		}
 
 		sg_platf_new_link(&link);
 
 		surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
-		if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+		if (struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX){
 			char* tmp_link =  bprintf("%s_UP",link_id);
 			info->link_up   = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
 			free(tmp_link);
@@ -1501,7 +1459,7 @@ void routing_parse_Scluster(void)
 			info->link_up   = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
 			info->link_down = info->link_up;
 		}
-		xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
+		surf_routing_cluster_add_link(host_id,info);
 		xbt_free(link_id);
 		xbt_free(host_id);
 
@@ -1587,7 +1545,8 @@ void routing_parse_Scluster(void)
 			info->link_up   = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
 			info->link_down = info->link_up;
 		}
-		xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
+		surf_routing_cluster_add_link(host_id,info);
+
 		xbt_free(link_id);
 		xbt_free(host_id);
 
@@ -1644,7 +1603,8 @@ void routing_parse_Scluster(void)
 	  surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
 	  info->link_up   = xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL);
 	  info->link_down = info->link_up;
-	  xbt_dict_set(cluster_host_link,struct_cluster->id,info,xbt_free);
+	  surf_routing_cluster_add_link(struct_cluster->id, info);
+
 	  free(link_backbone);
   }
 
@@ -1704,7 +1664,7 @@ static void clean_routing_after_parse(void)
 	xbt_dict_free(&patterns);
 }
 
-static void routing_parse_Speer(void)
+static void routing_parse_Speer(sg_platf_peer_cbarg_t peer)
 {
   static int AX_ptr = 0;
   char *host_id = NULL;
@@ -1717,63 +1677,53 @@ static void routing_parse_Speer(void)
 
   surfxml_bufferstack_push(1);
 
-  SURFXML_BUFFER_SET(AS_id, struct_peer->id);
+  XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", peer->id);
+  sg_platf_new_AS_open(peer->id, "Full");
 
-  SURFXML_BUFFER_SET(AS_routing, "Full");
-  XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", struct_peer->id);
+  XBT_DEBUG(" ");
+  host_id = HOST_PEER(peer->id);
+  router_id = ROUTER_PEER(peer->id);
+  link_id_up = LINK_UP_PEER(peer->id);
+  link_id_down = LINK_DOWN_PEER(peer->id);
 
-  SURFXML_START_TAG(AS);
+  link_router = bprintf("%s_link_router", peer->id);
+  link_backbone = bprintf("%s_backbone", peer->id);
 
-  XBT_DEBUG(" ");
-  host_id = HOST_PEER(struct_peer->id);
-  router_id = ROUTER_PEER(struct_peer->id);
-  link_id_up = LINK_UP_PEER(struct_peer->id);
-  link_id_down = LINK_DOWN_PEER(struct_peer->id);
-
-  link_router = bprintf("%s_link_router", struct_peer->id);
-  link_backbone = bprintf("%s_backbone", struct_peer->id);
-
-  XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, struct_peer->power);
-  A_surfxml_host_state = A_surfxml_host_state_ON;
-  SURFXML_BUFFER_SET(host_id, host_id);
-  SURFXML_BUFFER_SET(host_power, struct_peer->power);
-  SURFXML_BUFFER_SET(host_availability, "1.0");
-  SURFXML_BUFFER_SET(host_availability_file, struct_peer->availability_trace);
-  SURFXML_BUFFER_SET(host_state_file, struct_peer->state_trace);
-  SURFXML_BUFFER_SET(host_coordinates, "");
-  SURFXML_BUFFER_SET(host_core, "1.0");
-  SURFXML_START_TAG(host);
-  SURFXML_END_TAG(host);
-
-  XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, struct_peer->coord);
-  SURFXML_BUFFER_SET(router_id, router_id);
-  SURFXML_BUFFER_SET(router_coordinates, struct_peer->coord);
-  SURFXML_START_TAG(router);
-  SURFXML_END_TAG(router);
-
-  XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, struct_peer->bw_in, struct_peer->lat);
-  A_surfxml_link_state = A_surfxml_link_state_ON;
-  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-  SURFXML_BUFFER_SET(link_id, link_id_up);
-  SURFXML_BUFFER_SET(link_bandwidth, struct_peer->bw_in);
-  SURFXML_BUFFER_SET(link_latency, struct_peer->lat);
-  SURFXML_BUFFER_SET(link_bandwidth_file, "");
-  SURFXML_BUFFER_SET(link_latency_file, "");
-  SURFXML_BUFFER_SET(link_state_file, "");
-  SURFXML_START_TAG(link);
-  SURFXML_END_TAG(link);
-
-  XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, struct_peer->bw_out, struct_peer->lat);
-  A_surfxml_link_state = A_surfxml_link_state_ON;
-  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-  SURFXML_BUFFER_SET(link_id, link_id_down);
-  SURFXML_BUFFER_SET(link_bandwidth, struct_peer->bw_out);
-  SURFXML_BUFFER_SET(link_latency, struct_peer->lat);
-  SURFXML_BUFFER_SET(link_bandwidth_file, "");
-  SURFXML_BUFFER_SET(link_latency_file, "");
-  SURFXML_BUFFER_SET(link_state_file, "");
-  SURFXML_START_TAG(link);
-  SURFXML_END_TAG(link);
+  XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\"/>", host_id, peer->power);
+  s_sg_platf_host_cbarg_t host;
+  memset(&host,0,sizeof(host));
+  host.initial_state = SURF_RESOURCE_ON;
+  host.id = host_id;
+  host.power_peak = peer->power;
+  host.power_scale = 1.0;
+  host.power_trace = peer->availability_trace;
+  host.state_trace = peer->state_trace;
+  host.core_amount = 1;
+  sg_platf_new_host(&host);
+
+
+  XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer->coord);
+  s_sg_platf_router_cbarg_t router;
+  memset(&router,0,sizeof(router));
+  router.id = router_id;
+  router.coord = peer->coord;
+  sg_platf_new_router(&router);
+
+  XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id_up, peer->bw_in, peer->lat);
+  s_sg_platf_link_cbarg_t link;
+  memset(&link,0,sizeof(link));
+  link.state = SURF_RESOURCE_ON;
+  link.policy = SURF_LINK_SHARED;
+  link.id = link_id_up;
+  link.bandwidth = peer->bw_in;
+  link.latency = peer->lat;
+  sg_platf_new_link(&link);
+
+  // FIXME: dealing with full duplex is not the role of this piece of code, I'd say [Mt]
+  // Instead, it should be created fullduplex, and the models will do what's needed in this case
+  XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id_down, peer->bw_out, peer->lat);
+  link.id = link_id_down;
+  sg_platf_new_link(&link);
 
   XBT_DEBUG(" ");
 
@@ -1812,7 +1762,7 @@ static void routing_parse_Speer(void)
   SURFXML_END_TAG(route);
 
   XBT_DEBUG("</AS>");
-  SURFXML_END_TAG(AS);
+  sg_platf_new_AS_close();
   XBT_DEBUG(" ");
 
   //xbt_dynar_free(&tab_elements_num);
@@ -1931,4 +1881,3 @@ static void routing_parse_Srandom(void)
       xbt_dynar_free(&radical_elements);
     }
 }
-