X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2eae9b903fa523a15a5c8b4adb4471b6bd1e0af1..cf56a22da60094d8e7f14b1457526dc194d40226:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 898857becd..cba58fbacc 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -11,42 +11,47 @@
 #include "surf_private.h"
 #include "xbt/dict.h"
 
-typedef enum {
-  SURF_NETWORK_LINK_ON = 1,	/* Ready        */
-  SURF_NETWORK_LINK_OFF = 0	/* Running      */
-} e_surf_network_link_state_t;
-
-typedef struct network_link {
-  surf_resource_t resource;	/* Any such object, added in a trace
+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
-     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_t, *network_link_t;
+} s_link_CM02_t, *link_CM02_t;
 
 
-typedef struct network_card {
+typedef struct network_card_CM02 {
   char *name;
   int id;
-} s_network_card_t, *network_card_t;
+} s_network_card_CM02_t, *network_card_CM02_t;
 
-typedef struct surf_action_network {
+typedef struct surf_action_network_CM02 {
   s_surf_action_t generic_action;
   double latency;
   double lat_current;
   lmm_variable_t variable;
+  double rate;
   int suspended;
-  network_card_t src;
-  network_card_t dst;
-} s_surf_action_network_t, *surf_action_network_t;
+  network_card_CM02_t src;
+  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 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 */