X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1725c8afe6c72f99e43d33de6935f9e0decb040c..f00F8da2:/src/surf/surf_private.h

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index d96ba82d49..296fef3cd6 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -10,13 +10,19 @@
 #include "surf/maxmin.h"
 #include "surf/trace_mgr.h"
 #include "xbt/log.h"
-#include "surf/surfxml_parse_private.h"
+#include "surf/surfxml_parse.h"
 #include "surf/random_mgr.h"
 #include "instr/instr_private.h"
 #include "surf/surfxml_parse_values.h"
 
 #define NO_MAX_DURATION -1.0
 
+typedef enum {
+  UM_FULL,
+  UM_LAZY,
+  UM_UNDEFINED
+} e_UM_t;
+
 /* user-visible parameters */
 extern double sg_tcp_gamma;
 extern double sg_sender_gap;
@@ -24,7 +30,7 @@ extern double sg_latency_factor;
 extern double sg_bandwidth_factor;
 extern double sg_weight_S_parameter;
 extern int sg_maxmin_selective_update;
-extern int sg_network_fullduplex;
+extern int sg_network_crosstraffic;
 #ifdef HAVE_GTNETS
 extern double sg_gtnets_jitter;
 extern int sg_gtnets_jitter_seed;
@@ -60,6 +66,13 @@ 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);    /* cannot declare inline since we use a pointer to it */
+
+void surf_action_lmm_update_index_heap(void *action, int i); /* callback for heap management shared by cpu and net models */
+void surf_action_lmm_heap_insert(xbt_heap_t heap, surf_action_lmm_t action,
+    double key, enum heap_action_type hat);
+void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action);
+
+
 FILE *surf_fopen(const char *name, const char *mode);
 
 extern tmgr_history_t history;
@@ -90,7 +103,7 @@ const char *__surf_get_initial_path(void);
 int __surf_is_absolute_file_path(const char *file_path);
 
 /*
- * One link routing list
+ * Link of lenght 1, alongside with its source and destination. This is mainly usefull in the bindings to gtnets and ns3
  */
 typedef struct s_onelink {
   char *src;
@@ -112,13 +125,9 @@ typedef struct s_model_type {
 
 typedef struct s_route {
   xbt_dynar_t link_list;
-} s_route_t, *route_t;
-
-typedef struct s_route_extended {
-  s_route_t generic_route;
   char *src_gateway;
   char *dst_gateway;
-} s_route_extended_t, *route_extended_t;
+} s_route_t, *route_t;
 
 /* This enum used in the routing structure helps knowing in which situation we are. */
 typedef enum {
@@ -135,14 +144,14 @@ typedef struct s_as {
   char *name;
   struct s_as *routing_father;
   xbt_dict_t routing_sons;
-  route_extended_t(*get_route) (AS_t as, const char *src,
-                                const char *dst);
-  double(*get_latency) (AS_t as, const char *src,
-                        const char *dst, route_extended_t e_route);
+
+  void (*get_route_and_latency) (AS_t as, const char *src, const char *dst, route_t into, double *latency);
+
   xbt_dynar_t(*get_onelink_routes) (AS_t as);
-  route_extended_t(*get_bypass_route) (AS_t as,
-                                       const char *src, const char *dst);
+  route_t(*get_bypass_route) (AS_t as, const char *src, const char *dst);
   void (*finalize) (AS_t as);
+
+
   /* The parser calls the following functions to inform the routing models
    * that a new element is added to the AS currently built.
    *
@@ -150,16 +159,18 @@ typedef struct s_as {
   void (*parse_PU) (AS_t as, const char *name); /* A host or a router, whatever */
   void (*parse_AS) (AS_t as, const char *name);
   void (*parse_route) (AS_t as, const char *src,
-                     const char *dst, route_extended_t route);
+                     const char *dst, route_t route);
   void (*parse_ASroute) (AS_t as, const char *src,
-                       const char *dst, route_extended_t route);
+                       const char *dst, route_t route);
   void (*parse_bypassroute) (AS_t as, const char *src,
-                           const char *dst, route_extended_t e_route);
+                           const char *dst, route_t e_route);
 } s_as_t;
 
 typedef struct s_network_element_info {
   AS_t rc_component;
   e_surf_network_element_type_t rc_type;
+  int id;
+  char *name;
 } s_network_element_info_t, *network_element_info_t;
 
 typedef int *network_element_t;
@@ -168,17 +179,19 @@ struct s_routing_global {
   AS_t root;
   void *loopback;
   size_t size_of_link;
-  xbt_dynar_t(*get_route_no_cleanup) (const char *src, const char *dst);
+  xbt_dynar_t last_route;
   xbt_dynar_t(*get_onelink_routes) (void);
-  void (*get_route_latency)(const char *src, const char *dst,
-                            xbt_dynar_t *route, double *latency, int cleanup);
 };
 
 XBT_PUBLIC(void) routing_model_create(size_t size_of_link, void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) routing_register_callbacks(void);
+XBT_PUBLIC(void) generic_free_route(route_t route); // FIXME rename to routing_route_free
+ // FIXME: make previous function private to routing again?
+
 
-XBT_PUBLIC(xbt_dynar_t) routing_get_route(const char *src, const char *dst);
+XBT_PUBLIC(void) routing_get_route_and_latency(const char *src, const char *dst,
+                              xbt_dynar_t * route, double *latency);
 
 /**
  * Resource protected methods