X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c354c48ec90c997cc7213ce96ca97d882934166..d585628e4581e3f987caafbff7f074644f3e2bce:/src/surf/network_private.h

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 0032cd5994..c9dd0b54e8 100644
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -9,21 +9,22 @@
 #define _SURF_NETWORK_PRIVATE_H
 
 #include "surf_private.h"
+#include "xbt/dict.h"
 
 typedef enum {
-  SURF_NETWORK_LINK_ON = 1,		/* Ready        */
-  SURF_NETWORK_LINK_OFF = 0		/* Running      */
+  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
-				 should start by this field!!! */
-                              /* Using this object with the public part of
-				 resource does not make sense */
-  const char *name;
-  xbt_maxmin_float_t bw_current;
+  surf_resource_t resource;	/* 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 */
+  char *name;
+  double bw_current;
   tmgr_trace_event_t bw_event;
-  xbt_maxmin_float_t lat_current;
+  double lat_current;
   tmgr_trace_event_t lat_event;
   e_surf_network_link_state_t state_current;
   tmgr_trace_event_t state_event;
@@ -32,17 +33,21 @@ typedef struct network_link {
 
 
 typedef struct network_card {
-  const char *name;
+  char *name;
   int id;
 } s_network_card_t, *network_card_t;
 
 typedef struct surf_action_network {
   s_surf_action_t generic_action;
-  xbt_heap_float_t latency;
-  xbt_heap_float_t lat_current;
+  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;
 
+extern xbt_dict_t network_card_set;
+
 #endif				/* _SURF_NETWORK_PRIVATE_H */