Propagate the s/network_link/link/ from the XML to the C code (hope I didn't break...

[simgrid.git] / src / surf / network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index a1b52c8..e6c50cc 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -12,19 +12,21 @@
 #include "xbt/dict.h"
 
 typedef struct network_link_CM02 {
-  surf_resource_t resource;    /* Any such object, added in a trace
+  surf_model_t model;  /* Any such object, added in a trace
                                   should start by this field!!! */
   /* Using this object with the public part of
-     resource does not make sense */
+     model does not make sense */
   char *name;
   double bw_current;
   tmgr_trace_event_t bw_event;
   double lat_current;
   tmgr_trace_event_t lat_event;
-  e_surf_network_link_state_t state_current;
+  e_surf_link_state_t state_current;
   tmgr_trace_event_t state_event;
   lmm_constraint_t constraint;
-} s_network_link_CM02_t, *network_link_CM02_t;
+  /*holds the properties associated with a link*/
+  xbt_dict_t properties;
+} s_link_CM02_t, *link_CM02_t;
 
 
 typedef struct network_card_CM02 {
@@ -45,4 +47,12 @@ typedef struct surf_action_network_CM02 {
 
 extern xbt_dict_t network_card_set;
 
+
+extern int card_number;
+extern link_CM02_t **routing_table;
+extern int *routing_table_size;
+
+#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
+#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
+
 #endif                         /* _SURF_NETWORK_PRIVATE_H */