X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..b84bad24cc0d403e9773384376ecff7d360f8379:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index f75a7f6fac..bd935818eb 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -13,31 +13,32 @@
 #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
+extern double sg_tcp_gamma;
 
 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 (*model_used) (void *model_id);
-  /* Share the models to the actions and return in hom much time
+  int (*resource_used) (void *resource_id);
+  /* Share the resources to the actions and return in how much time
      the next action may terminate */
-  double (*share_models) (double now);
+  double (*share_resources) (double now);
   /* Update the actions' state */
   void (*update_actions_state) (double now, double delta);
-  void (*update_model_state) (void *id, tmgr_trace_event_t event_type,
-				 double value);
+  void (*update_resource_state) (void *id, tmgr_trace_event_t event_type,
+                                 double value, double time);
   void (*finalize) (void);
 } s_surf_model_private_t;
 
@@ -47,28 +48,28 @@ typedef struct surf_model_private {
 extern int use_sdp_solver;
 extern int use_lagrange_solver;
 
-double generic_maxmin_share_models(xbt_swag_t running_actions,
-				      size_t offset);
-double generic_maxmin_share_models2(xbt_swag_t running_actions,
-				       size_t offset,
-				       lmm_system_t sys,
-				       void (*solve)(lmm_system_t));
+double generic_maxmin_share_resources(xbt_swag_t running_actions,
+                                      size_t offset,
+                                      lmm_system_t sys,
+                                      void (*solve) (lmm_system_t));
 
-/* Generic functions common to all ressources */
-e_surf_action_state_t surf_action_get_state(surf_action_t action);
+/* Generic functions common to all models */
+e_surf_action_state_t surf_action_state_get(surf_action_t action);
 double surf_action_get_start_time(surf_action_t action);
 double surf_action_get_finish_time(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_set_data(surf_action_t action,
-			  void *data);
-FILE * surf_fopen(const char *name, const char *mode);
+void surf_action_state_set(surf_action_t action,
+                              e_surf_action_state_t state);
+void surf_action_data_set(surf_action_t action, void *data);
+FILE *surf_fopen(const char *name, const char *mode);
 
-extern lmm_system_t maxmin_system;
 extern tmgr_history_t history;
 extern xbt_dynar_t surf_path;
 
+void surf_config_init(int *argc, char **argv);
+void surf_config_finalize(void);
+void surf_config(const char *name, va_list pa);
+
 
 /*
  * Returns the initial path. On Windows the initial path is
@@ -76,12 +77,25 @@ extern xbt_dynar_t surf_path;
  * case the function returns "./" that represents the current
  * directory on Unix/Linux platforms.
  */
-const char* __surf_get_initial_path(void);
+const char *__surf_get_initial_path(void);
 
 /* The __surf_is_absolute_file_path() returns 1 if
  * file_path is a absolute file path, in the other
  * case the function returns 0.
  */
-int __surf_is_absolute_file_path(const char* file_path);
+int __surf_is_absolute_file_path(const char *file_path);
+
+/*
+ * Routing logic
+ */
+struct s_routing {
+  const char *name;
+  xbt_dict_t host_id; /* char* -> int* */
+
+  xbt_dynar_t (*get_route)(int src, int dst);
+  void (*finalize)(void);
+  int host_count;
+};
+XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
 
-#endif				/* _SURF_SURF_PRIVATE_H */
+#endif /* _SURF_SURF_PRIVATE_H */