Three new routing schema by Silas De Munck

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index a52ff94..85ddca0 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -20,11 +20,6 @@ extern double sg_tcp_gamma;
 
 extern const char *surf_action_state_names[6];
 
-typedef enum {
-  SURF_LINK_ON = 1,             /* Ready        */
-  SURF_LINK_OFF = 0             /* Running      */
-} e_surf_link_state_t;
-
 typedef enum {
   SURF_LINK_SHARED = 1,
   SURF_LINK_FATPIPE = 0
@@ -42,12 +37,6 @@ typedef struct surf_model_private {
   void (*finalize) (void);
 } s_surf_model_private_t;
 
-/* #define pub2priv(r) ((surf_model_private_t) ((char *)(r) -(sizeof(struct surf_model_private_part)))) */
-/* #define priv2pub(r) ((void *) ((char *)(r) +(sizeof(struct surf_model_private_part)))) */
-
-extern int use_sdp_solver;
-extern int use_lagrange_solver;
-
 double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,
@@ -93,6 +82,7 @@ struct s_routing {
   xbt_dict_t host_id; /* char* -> int* */
 
   xbt_dynar_t (*get_route)(int src, int dst);
+  void (*finalize_route)(xbt_dynar_t route);
   void (*finalize)(void);
   int host_count;
 };