X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27680c02b4e665650698b64e4da27bc1cbfc2752..1b30f00857843f1cee60814ed519ff82e8ef4787:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index cba58fbacc..137203abd1 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -12,46 +12,26 @@
 #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;
+  s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */
+
   /* 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;
   tmgr_trace_event_t lat_event;
-  e_surf_link_state_t state_current;
-  tmgr_trace_event_t state_event;
-  lmm_constraint_t constraint;
 } s_link_CM02_t, *link_CM02_t;
 
 
-typedef struct network_card_CM02 {
-  char *name;
-  int id;
-} s_network_card_CM02_t, *network_card_CM02_t;
-
 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;
-  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;
 
+  int src;  /* saving source id for tracing */
+  int dst; /* saving dest id for tracing */
+} s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
-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 */
+#endif /* _SURF_NETWORK_PRIVATE_H */