Add a peer tag to the DTD and make it compatible with vivaldi and lastmile.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8954 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 24d4b91..a3b7858 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -47,6 +47,8 @@ XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassRoute_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassRoute_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_cluster_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_cluster_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_peer_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_peer_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_config_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_config_cb_list;
 

diff --git a/src/surf/simgrid.dtd b/src/surf/simgrid.dtd
index c50ed6b..ab71d16 100644 (file)
--- a/src/surf/simgrid.dtd
+++ b/src/surf/simgrid.dtd
@@ -1,5 +1,5 @@
 <!-- Small DTD for SURF based tools. -->
-<!ELEMENT platform ((config)?,(include|cluster|AS|trace|trace_connect)*,(include|process)*)>
+<!ELEMENT platform ((config)?,(include|cluster|peer|AS|trace|trace_connect)*,(include|process)*)>
 <!ATTLIST platform version CDATA "0.0">
 
 <!ELEMENT trace (#PCDATA)>
@@ -20,7 +20,8 @@
 <!ATTLIST trace_connect trace CDATA #REQUIRED>
 <!ATTLIST trace_connect element CDATA #REQUIRED>
 
-<!ELEMENT AS (((AS|link|cluster|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
+<!ELEMENT AS (((AS|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
+
 <!ATTLIST AS id CDATA #REQUIRED>
 <!ATTLIST AS routing CDATA #REQUIRED>
 
@@ -47,6 +48,15 @@
 <!ATTLIST cluster bb_lat CDATA #REQUIRED>
 <!ATTLIST cluster bb_sharing_policy (SHARED|FATPIPE) "SHARED">
 
+<!ELEMENT peer EMPTY>
+<!ATTLIST peer id CDATA #REQUIRED>
+<!ATTLIST peer power CDATA #REQUIRED>
+<!ATTLIST peer bw_in CDATA #REQUIRED>
+<!ATTLIST peer bw_out CDATA #REQUIRED>
+<!ATTLIST peer lat CDATA #REQUIRED>
+<!ATTLIST peer coordinates CDATA "">
+<!ATTLIST peer sharing_policy (SHARED|FULLDUPLEX|FATPIPE) "SHARED">
+
 <!ELEMENT router EMPTY>
 <!ATTLIST router id CDATA #REQUIRED>
 <!ATTLIST router coordinates  CDATA "">

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 9dc1bcc..024ea27 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -62,6 +62,7 @@ static void model_none_unload(void);    /* none routing model */
 static void model_none_end(void);       /* none routing model */
 
 static void routing_parse_Scluster(void);  /*cluster bypass */
+static void routing_parse_Speer(void);         /*peer bypass */
 
 static void routing_parse_Sconfig(void);        /*config Tag */
 static void routing_parse_Econfig(void);        /*config Tag */
@@ -276,6 +277,11 @@ static void parse_S_router(void)
 #ifdef HAVE_TRACING
   TRACE_surf_host_declaration(A_surfxml_router_id, 0);
 #endif
+  if (strcmp(A_surfxml_router_coordinates,"")) {
+       xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
+       xbt_dynar_shrink(ctn,0);
+       xbt_dict_set (coordinates,A_surfxml_router_id,ctn,NULL);
+  }
 }
 
 /**
@@ -832,8 +838,8 @@ static double _get_latency(const char *src, const char *dst)
                 "bad gateway for route between \"%s\" and \"%s\"", src,
                 dst);            
     latency =
-          (*(common_father->get_latency)) (common_father, src_father->name,
-                                         dst_father->name);
+          (*(common_father->get_latency)) (common_father, e_route_cnt->src_gateway,
+                                         e_route_cnt->src_gateway);
     xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"",
                 src_father->name, dst_father->name);
     
@@ -1083,6 +1089,9 @@ 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);
+
   surfxml_add_callback(STag_surfxml_config_cb_list,
                                           &routing_parse_Sconfig);
   surfxml_add_callback(ETag_surfxml_config_cb_list,
@@ -2364,8 +2373,8 @@ static void model_rulebased_set_ASroute(routing_component_t rc,
   ruleroute_e->re_src_gateway = route->src_gateway;
   ruleroute_e->re_dst_gateway = route->dst_gateway;
   xbt_dynar_push(routing->list_ASroute, &ruleroute_e);
-  xbt_free(route->src_gateway);
-  xbt_free(route->dst_gateway);
+//  xbt_free(route->src_gateway);
+//  xbt_free(route->dst_gateway);
   xbt_free(route);
 }
 
@@ -2643,7 +2652,7 @@ static void *model_rulebased_create(void)
   new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes;
   new_component->generic_routing.get_route = rulebased_get_route;
   new_component->generic_routing.get_latency = generic_get_link_latency;
-  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;       //rulebased_get_bypass_route;
+  new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route;
   new_component->generic_routing.finalize = rulebased_finalize;
   /* initialization of internal structures */
   new_component->dict_processing_units = xbt_dict_new();
@@ -3550,6 +3559,156 @@ static void routing_parse_Scluster(void)
   surfxml_bufferstack_pop(1);
 }
 
+static void routing_parse_Speer(void)
+{
+  static int AX_ptr = 0;
+
+  char *peer_id = A_surfxml_peer_id;
+  char *peer_power = A_surfxml_peer_power;
+  char *peer_bw_in = A_surfxml_peer_bw_in;
+  char *peer_bw_out = A_surfxml_peer_bw_out;
+  char *peer_lat = A_surfxml_peer_lat;
+  char *peer_coord = A_surfxml_peer_coordinates;
+
+  char *host_id = NULL;
+  char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down;
+
+#ifdef HAVE_PCRE_LIB
+
+#endif
+
+  int peer_sharing_policy = AX_surfxml_peer_sharing_policy;
+
+#ifndef HAVE_PCRE_LIB
+  //xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
+  //char *route_src, *route_dst;
+  //int j;
+#endif
+
+  static unsigned int surfxml_buffer_stack_stack_ptr = 1;
+  static unsigned int surfxml_buffer_stack_stack[1024];
+
+  surfxml_buffer_stack_stack[0] = 0;
+
+  surfxml_bufferstack_push(1);
+
+  SURFXML_BUFFER_SET(AS_id, peer_id);
+#ifdef HAVE_PCRE_LIB
+  SURFXML_BUFFER_SET(AS_routing, "RuleBased");
+  DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">", peer_id);
+#else
+  SURFXML_BUFFER_SET(AS_routing, "Full");
+  DEBUG1("<AS id=\"%s\"\trouting=\"Full\">", peer_id);
+#endif
+  SURFXML_START_TAG(AS);
+
+  DEBUG0(" ");
+  host_id = bprintf("peer_%s", peer_id);
+  router_id = bprintf("router_%s", peer_id);
+  link_id_up = bprintf("link_%s_up", peer_id);
+  link_id_down = bprintf("link_%s_down", peer_id);
+
+  link_router = bprintf("%s_link_router", peer_id);
+  link_backbone = bprintf("%s_backbone", peer_id);
+
+  DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, peer_power);
+  A_surfxml_host_state = A_surfxml_host_state_ON;
+  SURFXML_BUFFER_SET(host_id, host_id);
+  SURFXML_BUFFER_SET(host_power, peer_power);
+  SURFXML_BUFFER_SET(host_availability, "1.0");
+  SURFXML_BUFFER_SET(host_availability_file, "");
+  SURFXML_BUFFER_SET(host_state_file, "");
+  SURFXML_START_TAG(host);
+  SURFXML_END_TAG(host);
+
+  DEBUG2("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer_coord);
+  SURFXML_BUFFER_SET(router_id, router_id);
+  SURFXML_BUFFER_SET(router_coordinates, peer_coord);
+  SURFXML_START_TAG(router);
+  SURFXML_END_TAG(router);
+
+  DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, peer_bw_in, peer_lat);
+  A_surfxml_link_state = A_surfxml_link_state_ON;
+  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+  if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX)
+{A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+  if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FATPIPE)
+{A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+  SURFXML_BUFFER_SET(link_id, link_id_up);
+  SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in);
+  SURFXML_BUFFER_SET(link_latency, 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);
+
+  DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, peer_bw_out, peer_lat);
+  A_surfxml_link_state = A_surfxml_link_state_ON;
+  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+  if(peer_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+{A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
+  if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FATPIPE)
+{A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
+  SURFXML_BUFFER_SET(link_id, link_id_down);
+  SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out);
+  SURFXML_BUFFER_SET(link_latency, 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);
+
+  DEBUG0(" ");
+
+  // begin here
+  DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", peer_id, router_id);
+  DEBUG0("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, peer_id);
+  SURFXML_BUFFER_SET(route_dst, router_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  DEBUG1("<link_ctn\tid=\"%s\"/>", link_id_up);
+  SURFXML_BUFFER_SET(link_ctn_id, link_id_up);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX)
+  {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  DEBUG0("</route>");
+  SURFXML_END_TAG(route);
+
+  //Opposite Route
+  DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, peer_id);
+  DEBUG0("symmetrical=\"NO\">");
+  SURFXML_BUFFER_SET(route_src, router_id);
+  SURFXML_BUFFER_SET(route_dst, peer_id);
+  A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+  SURFXML_START_TAG(route);
+
+  DEBUG1("<link_ctn\tid=\"%s\"/>", link_id_down);
+  SURFXML_BUFFER_SET(link_ctn_id, link_id_down);
+  A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+  if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX)
+  {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
+  SURFXML_START_TAG(link_ctn);
+  SURFXML_END_TAG(link_ctn);
+
+  DEBUG0("</route>");
+  SURFXML_END_TAG(route);
+
+  DEBUG0("</AS>");
+  SURFXML_END_TAG(AS);
+  DEBUG0(" ");
+
+  //xbt_dynar_free(&tab_elements_num);
+
+  surfxml_bufferstack_pop(1);
+}
+
+
 /*
  * New methods to init the routing model component from the lua script
  */

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 03e8b0a..d9280a4 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -76,6 +76,8 @@ xbt_dynar_t STag_surfxml_prop_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
 xbt_dynar_t STag_surfxml_cluster_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL;
+xbt_dynar_t STag_surfxml_peer_cb_list = NULL;
+xbt_dynar_t ETag_surfxml_peer_cb_list = NULL;
 xbt_dynar_t STag_surfxml_trace_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_trace_cb_list = NULL;
 xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL;
@@ -144,6 +146,8 @@ void surf_parse_free_callbacks(void)
   xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list);
   xbt_dynar_free(&STag_surfxml_cluster_cb_list);
   xbt_dynar_free(&ETag_surfxml_cluster_cb_list);
+  xbt_dynar_free(&STag_surfxml_peer_cb_list);
+  xbt_dynar_free(&ETag_surfxml_peer_cb_list);
   xbt_dynar_free(&STag_surfxml_config_cb_list);
   xbt_dynar_free(&ETag_surfxml_config_cb_list);
 }
@@ -199,6 +203,10 @@ void surf_parse_reset_parser(void)
       xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_cluster_cb_list =
       xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  STag_surfxml_peer_cb_list =
+      xbt_dynar_new(sizeof(void_f_void_t), NULL);
+  ETag_surfxml_peer_cb_list =
+      xbt_dynar_new(sizeof(void_f_void_t), NULL);
   STag_surfxml_config_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
   ETag_surfxml_config_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
 }
@@ -270,6 +278,8 @@ parse_method(S, bypassRoute);
 parse_method(E, bypassRoute);
 parse_method(S, cluster);
 parse_method(E, cluster);
+parse_method(S, peer);
+parse_method(E, peer);
 parse_method(S, config);
 parse_method(E, config);