Added correction factors for Hockney basic model. The capacity parameter is limited...

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

diff --git a/src/surf/network.c b/src/surf/network.c
index bb29cfa..3114caa 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -18,6 +18,8 @@ static void (*network_solve) (lmm_system_t) = NULL;
 xbt_dict_t link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
+double alpha_legrandvelho = 1;
+double beta_legrandvelho = 0;
 int card_number = 0;
 int host_number = 0;
 link_CM02_t **routing_table = NULL;
@@ -308,8 +310,8 @@ static int resource_used(void *resource_id)
 
 static int action_free(surf_action_t action)
 {
-  action->using--;
-  if (!action->using) {
+  action->refcount --;
+  if (!action->refcount ) {
     xbt_swag_remove(action, action->state_set);
     if (((surf_action_network_CM02_t) action)->variable)
       lmm_variable_free(network_maxmin_system,
@@ -322,7 +324,7 @@ static int action_free(surf_action_t action)
 
 static void action_use(surf_action_t action)
 {
-  action->using++;
+  action->refcount ++;
 }
 
 static void action_cancel(surf_action_t action)
@@ -452,7 +454,7 @@ static void update_resource_state(void *id,
                                                      lat_current));
       else
        lmm_update_variable_bound(network_maxmin_system, action->variable,
-                                 min(action->rate,
+                                 min(action->rate*alpha_legrandvelho,
                                      SG_TCP_CTE_GAMMA / (2.0 *
                                                          action->
                                                          lat_current)));
@@ -514,7 +516,7 @@ static surf_action_t communicate(void *src, void *dst, double size,
 
   action = xbt_new0(s_surf_action_network_CM02_t, 1);
 
-  action->generic_action.using = 1;
+  action->generic_action.refcount  = 1;
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.max_duration = NO_MAX_DURATION;
@@ -565,13 +567,13 @@ static surf_action_t communicate(void *src, void *dst, double size,
   } else {
     if (action->lat_current > 0)
       lmm_update_variable_bound(network_maxmin_system, action->variable,
-                               min(action->rate,
+                               min(action->rate*alpha_legrandvelho,
                                    SG_TCP_CTE_GAMMA / (2.0 *
                                                        action->
                                                        lat_current)));
     else
       lmm_update_variable_bound(network_maxmin_system, action->variable,
-                               action->rate);
+                               action->rate*alpha_legrandvelho);
   }
   lmm_update_variable_latency(network_maxmin_system, action->variable,
                              action->latency);
@@ -766,6 +768,25 @@ static void surf_network_model_init_internal(void)
     network_maxmin_system = lmm_system_new();
 }
 
+/***************************************************************************/
+/* New TCP sharing model based on thesis experimantation and discussions.  */
+/***************************************************************************/
+void surf_network_model_init_LegrandVelho(const char *filename)
+{
+  if (surf_network_model)
+    return;
+  surf_network_model_init_internal();
+  define_callbacks(filename);
+  xbt_dynar_push(model_list, &surf_network_model);
+  network_solve = lmm_solve;
+  alpha_legrandvelho = 0.92;
+  beta_legrandvelho = 10.4;
+  update_model_description(surf_network_model_description,
+                          "LegrandVelho",
+                          (surf_model_t) surf_network_model);
+  INFO0("LegrandVelho Model was chosen!!");
+}
+
 /***************************************************************************/
 /* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */
 /***************************************************************************/
@@ -845,7 +866,7 @@ void surf_network_model_init_Vegas(const char *filename)
 }
 
 #ifdef HAVE_SDP
-void surf_network_model_init_SDP(const char *filename)
+ void surf_network_model_init_SDP(const char *filename)
 {
   if (surf_network_model)
     return;
@@ -860,18 +881,3 @@ void surf_network_model_init_SDP(const char *filename)
                           (surf_model_t) surf_network_model);
 }
 #endif
-
-#ifdef HAVE_GTNETS
-void surf_network_model_init_GTNETS(const char *filename)
-{
-  if (surf_network_model)
-    return;
-  surf_network_model_init_internal();
-  define_callbacks(filename);
-  xbt_dynar_push(model_list, &surf_network_model);
-
-  update_model_description(surf_network_model_description,
-                          "GTNets",
-                          (surf_model_t) surf_network_model);
-}
-#endif