Do not mark inline hte functions of which we manipulate pointers to

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 85ddca0..9bad336 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -17,6 +17,11 @@
 
 #define NO_MAX_DURATION -1.0
 extern double sg_tcp_gamma;
+extern int sg_maxmin_selective_update;
+#ifdef HAVE_GTNETS
+  extern double sg_gtnets_jitter;
+  extern int sg_gtnets_jitter_seed;
+#endif
 
 extern const char *surf_action_state_names[6];
 
@@ -43,13 +48,13 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       void (*solve) (lmm_system_t));
 
 /* 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);
+e_surf_action_state_t surf_action_state_get(surf_action_t action); /* cannot declare inline since we use a pointer to it */
+double surf_action_get_start_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
+double surf_action_get_finish_time(surf_action_t action); /* cannot declare inline since we use a pointer to it */
 void surf_action_free(surf_action_t * action);
 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);
+void surf_action_data_set(surf_action_t action, void *data); /* cannot declare inline since we use a pointer to it */
 FILE *surf_fopen(const char *name, const char *mode);
 
 extern tmgr_history_t history;
@@ -74,17 +79,28 @@ const char *__surf_get_initial_path(void);
  */
 int __surf_is_absolute_file_path(const char *file_path);
 
+/*
+ * One link routing list
+ */
+typedef struct {
+       int src_id;
+       int dst_id;
+       void *link_ptr;
+}s_onelink, *s_onelink_t;
+
+
 /*
  * 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_route)(xbt_dynar_t route);
+  xbt_dict_t (*get_onelink_routes)(void);
+  int (*is_router)(int id);
   void (*finalize)(void);
   int host_count;
+  int router_count;
 };
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
 
@@ -94,4 +110,9 @@ XBT_PUBLIC(void) routing_model_create(size_t size_of_link,void *loopback);
  */
 XBT_PUBLIC(xbt_dict_t) surf_resource_properties(const void *resource);
 
+XBT_PUBLIC(void) surfxml_bufferstack_push(int new);
+XBT_PUBLIC(void) surfxml_bufferstack_pop(int new);
+XBT_PUBLIC_DATA(int) surfxml_bufferstack_size;
+
+
 #endif /* _SURF_SURF_PRIVATE_H */