Damn mac linker. Now, it's not complaining of multiple definition of sg_tcp_gamma...

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 1b960b7..2ed6eef 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -27,6 +27,8 @@ int host_number = 0;
 link_CM02_t **routing_table = NULL;
 int *routing_table_size = NULL;
 static link_CM02_t loopback = NULL;
+double sg_tcp_gamma = 0.0;
+
 
 static void create_routing_table(void)
 {
@@ -473,13 +475,11 @@ static void update_resource_state(void *id,
       action->weight += delta;
       if (action->rate < 0)
         lmm_update_variable_bound(network_maxmin_system, action->variable,
-                                  SG_TCP_CTE_GAMMA / (2.0 *
-                                                      action->lat_current));
+                                  sg_tcp_gamma / (2.0 * action->lat_current));
       else
         lmm_update_variable_bound(network_maxmin_system, action->variable,
                                   min(action->rate,
-                                      SG_TCP_CTE_GAMMA / (2.0 *
-                                                          action->lat_current)));
+                                      sg_tcp_gamma / (2.0 * action->lat_current)));
       if (!(action->suspended))
         lmm_update_variable_weight(network_maxmin_system, action->variable,
                                    action->weight);
@@ -544,7 +544,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
   action->generic_action.start = surf_get_clock();
   action->generic_action.finish = -1.0;
   action->generic_action.model_type = (surf_model_t) surf_network_model;
-  action->suspended = 0;        /* Should be useless because of the 
+  action->suspended = 0;        /* Should be useless because of the
                                    calloc but it seems to help valgrind... */
   action->generic_action.state_set =
     surf_network_model->common_public->states.running_action_set;
@@ -582,8 +582,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
   if (action->rate < 0) {
     if (action->lat_current > 0)
       lmm_update_variable_bound(network_maxmin_system, action->variable,
-                                SG_TCP_CTE_GAMMA / (2.0 *
-                                                    action->lat_current));
+                                sg_tcp_gamma / (2.0 * action->lat_current));
     else
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                 -1.0);
@@ -591,8 +590,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
     if (action->lat_current > 0)
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                 min(action->rate,
-                                    SG_TCP_CTE_GAMMA / (2.0 *
-                                                        action->lat_current)));
+                                    sg_tcp_gamma / (2.0 * action->lat_current)));
     else
       lmm_update_variable_bound(network_maxmin_system, action->variable,
                                 action->rate);