X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/12cdc9f3fef6c84dea9a3eb4602c2183d8bd3a9e..b930102d063e07f72299a505cc2392e713679aa5:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 9b1ee7667a..7ba7b90216 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -13,12 +13,11 @@
 #include "xbt/dict.h"
 
 typedef struct network_link_CM02 {
-  surf_model_t model;	/* Any such object, added in a trace
-				   should start by this field!!! */
+  s_surf_resource_t generic_resource; /* must remain first to be added to a trace */
+
   xbt_dict_t properties;
   /* Using this object with the public part of
      model does not make sense */
-  char *name;
   double bw_current;
   tmgr_trace_event_t bw_event;
   double lat_current;
@@ -30,7 +29,7 @@ typedef struct network_link_CM02 {
 
 
 typedef struct network_card_CM02 {
-  char *name;
+  s_surf_resource_t generic_resource; /* must remain first to allow casts */
   int id;
 } s_network_card_CM02_t, *network_card_CM02_t;
 
@@ -38,6 +37,7 @@ typedef struct surf_action_network_CM02 {
   s_surf_action_t generic_action;
   double latency;
   double lat_current;
+  double weight;
   lmm_variable_t variable;
   double rate;
   int suspended;
@@ -49,7 +49,7 @@ 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]
+#define ROUTE(i,j) routing_table[(i)+(j)*host_number]
+#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*host_number]
 
-#endif				/* _SURF_NETWORK_PRIVATE_H */
+#endif /* _SURF_NETWORK_PRIVATE_H */