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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 4a322d05b6..296fef3cd6 100644
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -20,7 +20,7 @@
 typedef enum {
   UM_FULL,
   UM_LAZY,
-  UM_UNDEFINED,
+  UM_UNDEFINED
 } e_UM_t;
 
 /* user-visible parameters */
@@ -30,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;
@@ -66,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;
@@ -75,12 +82,12 @@ void surf_config_init(int *argc, char **argv);
 void surf_config_finalize(void);
 void surf_config(const char *name, va_list pa);
 
-void im_net_action_recycle(surf_action_t action);
-double im_net_action_get_remains(surf_action_t action);
+void net_action_recycle(surf_action_t action);
+double net_action_get_remains(surf_action_t action);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 int net_get_link_latency_limited(surf_action_t action);
 #endif
-void im_net_action_set_max_duration(surf_action_t action, double duration);
+void net_action_set_max_duration(surf_action_t action, double duration);
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other
@@ -162,6 +169,8 @@ typedef struct s_as {
 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;