X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779..13c5da75068f441142fcf93d4d78124a7885d116:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 4cc3cf0529..b22d08a1fe 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -9,11 +9,13 @@
 #define _SURF_NETWORK_PRIVATE_H
 
 #include "surf_private.h"
+#include "network_common.h"
 #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!!! */
+  xbt_dict_t properties;
   /* Using this object with the public part of
      model does not make sense */
   char *name;
@@ -21,12 +23,10 @@ typedef struct network_link_CM02 {
   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;
-  /*holds the properties associated with a link*/
-  xbt_dict_t properties;
-} s_network_link_CM02_t, *network_link_CM02_t;
+} s_link_CM02_t, *link_CM02_t;
 
 
 typedef struct network_card_CM02 {
@@ -38,6 +38,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;
@@ -45,14 +46,11 @@ typedef struct surf_action_network_CM02 {
   network_card_CM02_t dst;
 } s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
-extern xbt_dict_t network_card_set;
-
-
 extern int card_number;
-extern network_link_CM02_t **routing_table;
+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 */