Prepare optim for xbt_lib-get_or_null

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 4a322d0..09753e3 100644 (file)
--- 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;
@@ -75,12 +75,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 +162,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;