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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index e417d40497..21de0d3ac5 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -13,23 +13,22 @@
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
 #include "surf/surfxml_parse_private.h"
+#include "surf/random_mgr.h"
 
 #define NO_MAX_DURATION -1.0
 #define SG_TCP_CTE_GAMMA 20000.0
 
-xbt_dict_t current_property_set;
-
 extern const char *surf_action_state_names[6];
 
 typedef enum {
-  SURF_NETWORK_LINK_ON = 1,	/* Ready        */
-  SURF_NETWORK_LINK_OFF = 0	/* Running      */
-} e_surf_network_link_state_t;
+  SURF_LINK_ON = 1,	/* Ready        */
+  SURF_LINK_OFF = 0	/* Running      */
+} e_surf_link_state_t;
 
 typedef enum {
-  SURF_NETWORK_LINK_SHARED = 1,
-  SURF_NETWORK_LINK_FATPIPE = 0
-} e_surf_network_link_sharing_policy_t;
+  SURF_LINK_SHARED = 1,
+  SURF_LINK_FATPIPE = 0
+} e_surf_link_sharing_policy_t;
 
 typedef struct surf_model_private {
   int (*resource_used) (void *resource_id);
@@ -39,7 +38,7 @@ typedef struct surf_model_private {
   /* Update the actions' state */
   void (*update_actions_state) (double now, double delta);
   void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
-				 double value);
+				 double value, double time);
   void (*finalize) (void);
 } s_surf_model_private_t;