Remove link_list from surf_routing.c and add it into the structure of *route and...

[simgrid.git] / include / simgrid / platf.h

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index cf291f7..99b92f5 100644 (file)
--- a/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@ -52,12 +52,6 @@ typedef enum {
   SURF_LINK_FATPIPE = 0
 } e_surf_link_sharing_policy_t;
 
   SURF_LINK_FATPIPE = 0
 } e_surf_link_sharing_policy_t;
 

-typedef enum {
-  SURF_LINK_DIRECTION_NONE = 2,
-  SURF_LINK_DIRECTION_UP = 1,
-  SURF_LINK_DIRECTION_DOWN = 0
-} e_surf_link_ctn_direction_t;
-

 typedef enum {
   SURF_TRACE_CONNECT_KIND_HOST_AVAIL = 4,
   SURF_TRACE_CONNECT_KIND_POWER = 3,
 typedef enum {
   SURF_TRACE_CONNECT_KIND_HOST_AVAIL = 4,
   SURF_TRACE_CONNECT_KIND_POWER = 3,


@@ -129,17 +123,12 @@ typedef struct s_sg_platf_peer_cbarg {
   tmgr_trace_t state_trace;
 } s_sg_platf_peer_cbarg_t;
 
   tmgr_trace_t state_trace;
 } s_sg_platf_peer_cbarg_t;
 

-typedef struct s_sg_platf_linkctn_cbarg *sg_platf_linkctn_cbarg_t;
-typedef struct s_sg_platf_linkctn_cbarg {
-  const char *id;
-  e_surf_link_ctn_direction_t direction;
-} s_sg_platf_linkctn_cbarg_t;
-

 typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t;
 typedef struct s_sg_platf_route_cbarg {
   int symmetrical;
   const char *src;
   const char *dst;
 typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t;
 typedef struct s_sg_platf_route_cbarg {
   int symmetrical;
   const char *src;
   const char *dst;

+  xbt_dynar_t link_list;

 } s_sg_platf_route_cbarg_t;
 
 typedef struct s_sg_platf_ASroute_cbarg *sg_platf_ASroute_cbarg_t;
 } s_sg_platf_route_cbarg_t;
 
 typedef struct s_sg_platf_ASroute_cbarg *sg_platf_ASroute_cbarg_t;


@@ -149,12 +138,14 @@ typedef struct s_sg_platf_ASroute_cbarg {
   const char *dst;
   const char *gw_src;
   const char *gw_dst;
   const char *dst;
   const char *gw_src;
   const char *gw_dst;

+  xbt_dynar_t link_list;

 } s_sg_platf_ASroute_cbarg_t;
 
 typedef struct s_sg_platf_bypassRoute_cbarg *sg_platf_bypassRoute_cbarg_t;
 typedef struct s_sg_platf_bypassRoute_cbarg {
   const char *src;
   const char *dst;
 } s_sg_platf_ASroute_cbarg_t;
 
 typedef struct s_sg_platf_bypassRoute_cbarg *sg_platf_bypassRoute_cbarg_t;
 typedef struct s_sg_platf_bypassRoute_cbarg {
   const char *src;
   const char *dst;

+  xbt_dynar_t link_list;

 } s_sg_platf_bypassRoute_cbarg_t;
 
 typedef struct s_sg_platf_bypassASroute_cbarg *sg_platf_bypassASroute_cbarg_t;
 } s_sg_platf_bypassRoute_cbarg_t;
 
 typedef struct s_sg_platf_bypassASroute_cbarg *sg_platf_bypassASroute_cbarg_t;


@@ -163,6 +154,7 @@ typedef struct s_sg_platf_bypassASroute_cbarg {
   const char *dst;
   const char *gw_src;
   const char *gw_dst;
   const char *dst;
   const char *gw_src;
   const char *gw_dst;

+  xbt_dynar_t link_list;

 } s_sg_platf_bypassASroute_cbarg_t;
 
 typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t;
 } s_sg_platf_bypassASroute_cbarg_t;
 
 typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t;


@@ -262,7 +254,6 @@ XBT_PUBLIC(void) sg_platf_new_host   (sg_platf_host_cbarg_t   host);   // Add an
 XBT_PUBLIC(void) sg_platf_new_host_link(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_router (sg_platf_router_cbarg_t router); // Add a router  to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_link   (sg_platf_link_cbarg_t link);     // Add a link    to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_host_link(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_router (sg_platf_router_cbarg_t router); // Add a router  to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_link   (sg_platf_link_cbarg_t link);     // Add a link    to the currently described AS

-XBT_PUBLIC(void) sg_platf_new_linkctn   (sg_platf_linkctn_cbarg_t linkctn);     // Add a linkctn

 XBT_PUBLIC(void) sg_platf_new_peer   (sg_platf_peer_cbarg_t peer);     // Add a peer    to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_cluster(sg_platf_cluster_cbarg_t clust); // Add a cluster to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet); // Add a cabinet to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_peer   (sg_platf_peer_cbarg_t peer);     // Add a peer    to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_cluster(sg_platf_cluster_cbarg_t clust); // Add a cluster to the currently described AS
 XBT_PUBLIC(void) sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet); // Add a cabinet to the currently described AS