update_actions_state

[simgrid.git] / src / surf / surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 809e6ae..9a25508 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -13,6 +13,7 @@
 #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
@@ -20,14 +21,14 @@
 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);
@@ -48,8 +49,6 @@ extern int use_sdp_solver;
 extern int use_lagrange_solver;
 
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
-                                     size_t offset);
-double generic_maxmin_share_resources2(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,
                                       void (*solve)(lmm_system_t));
@@ -68,7 +67,6 @@ FILE * surf_fopen(const char *name, const char *mode);
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
-
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other