mv surf_parse -> surfxml_parse

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 968c380..16e1cbb 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,10 +12,20 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
-#include "surf/surf_parse.h"
+#include "surf/surfxml_parse_private.h"
 
 #define NO_MAX_DURATION -1.0
 
+typedef enum {
+  SURF_NETWORK_LINK_ON = 1,    /* Ready        */
+  SURF_NETWORK_LINK_OFF = 0    /* Running      */
+} e_surf_network_link_state_t;
+
+typedef enum {
+  SURF_NETWORK_LINK_SHARED = 1,
+  SURF_NETWORK_LINK_FATPIPE = 0
+} e_surf_network_link_sharing_policy_t;
+
 typedef struct surf_resource_private {
   int (*resource_used) (void *resource_id);
   /* Share the resources to the actions and return in hom much time
@@ -33,6 +43,10 @@ typedef struct surf_resource_private {
 
 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);
+
 /* Generic functions common to all ressources */
 e_surf_action_state_t surf_action_get_state(surf_action_t action);
 void surf_action_free(surf_action_t * action);
@@ -42,6 +56,11 @@ void surf_action_set_data(surf_action_t action,
                          void *data);
 FILE *surf_fopen(const char *name, const char *mode);
 
+static _XBT_INLINE void surf_double_update(double *variable, double value) 
+{
+  *variable -= value;
+  if(*variable< 0.00001) *variable = 0.0;
+}
 extern lmm_system_t maxmin_system;
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;