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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 0eef6aa01c..270b889229 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -12,29 +12,60 @@
 #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
+#define SG_TCP_CTE_GAMMA 20000.0
+
+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;
+
+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);
+  int (*resource_used) (void *resource_id);
   /* Share the resources to the actions and return in hom much time
-      the next action may terminate */
-  xbt_heap_float_t(*share_resources) (xbt_heap_float_t now);	
+     the next action may terminate */
+  double (*share_resources) (double now);
   /* Update the actions' state */
-  void (*update_actions_state) (xbt_heap_float_t now, xbt_heap_float_t delta);
-  void (*update_resource_state) (void *id,tmgr_trace_event_t event_type, xbt_maxmin_float_t value);
-  void (*finalize)(void);
+  void (*update_actions_state) (double now, double delta);
+  void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
+				 double value);
+  void (*finalize) (void);
 } s_surf_resource_private_t;
 
 /* #define pub2priv(r) ((surf_resource_private_t) ((char *)(r) -(sizeof(struct surf_resource_private_part)))) */
 /* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_resource_private_part)))) */
 
+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);
-void surf_action_change_state(surf_action_t action, e_surf_action_state_t state);
+void surf_action_change_state(surf_action_t action,
+			      e_surf_action_state_t state);
+void surf_action_set_data(surf_action_t action,
+			  void *data);
+FILE *surf_fopen(const char *name, const char *mode);
 
-extern xbt_dynar_t resource_list;
+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;
 
 #endif				/* _SURF_SURF_PRIVATE_H */