X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86cd0192ed278be94c173e011ed9df47a555328a..09607a807fdf3a0a3396779e64fc402e73d936b8:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 6c2c6c1eb2..a8596dcf41 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -18,6 +18,10 @@ static void (*network_solve) (lmm_system_t) = NULL;
 xbt_dict_t link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
+double latency_factor = 1.0; /* default value */
+double bandwidth_factor = 1.0; /* default value */
+double weight_S_parameter = 0.0; /* default value */
+
 int card_number = 0;
 int host_number = 0;
 link_CM02_t **routing_table = NULL;
@@ -34,6 +38,7 @@ static void create_routing_table(void)
 static void link_free(void *nw_link)
 {
   free(((link_CM02_t) nw_link)->name);
+  xbt_dict_free(&(((link_CM02_t)nw_link)->properties));
   free(nw_link);
 }
 
@@ -69,7 +74,7 @@ static link_CM02_t link_new(char *name,
 
   nw_link->constraint =
       lmm_constraint_new(network_maxmin_system, nw_link,
-			 nw_link->bw_current);
+			 bandwidth_factor*nw_link->bw_current);
 
   if (policy == SURF_LINK_FATPIPE)
     lmm_constraint_shared(nw_link->constraint);
@@ -273,14 +278,6 @@ static void add_traces(void) {
       
       link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
    }
-
-   xbt_dict_free(&trace_connect_list_host_avail);
-   xbt_dict_free(&trace_connect_list_power);
-   xbt_dict_free(&trace_connect_list_link_avail);
-   xbt_dict_free(&trace_connect_list_bandwidth);
-   xbt_dict_free(&trace_connect_list_latency);
-   
-   xbt_dict_free(&traces_set_list); 
 }
 
 static void define_callbacks(const char *file)
@@ -288,20 +285,11 @@ static void define_callbacks(const char *file)
   /* Figuring out the network links */
   surfxml_add_callback(STag_surfxml_host_cb_list, &count_hosts);
   surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
-  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
   surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
   surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback);
-  surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets);
-  surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints);
-  surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route);
-  surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach);
-  surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster);
-  surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init);
-  surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize);
-  surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect);
 }
 
 static void *name_service(const char *name)
@@ -324,8 +312,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,
@@ -338,7 +326,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)
@@ -416,7 +404,7 @@ static void update_actions_state(double now, double delta)
       }
       if ((action->latency == 0.0) && !(action->suspended))
 	lmm_update_variable_weight(network_maxmin_system, action->variable,
-				   action->lat_current);
+				   action->weight);
     }
     double_update(&(action->generic_action.remains),
 		  lmm_variable_getvalue(action->variable) * deltap);
@@ -447,9 +435,24 @@ static void update_resource_state(void *id,
   /*     value, event_type); */
 
   if (event_type == nw_link->bw_event) {
+    double delta = weight_S_parameter/value - weight_S_parameter/nw_link->bw_current;
+    lmm_variable_t var = NULL;
+    lmm_element_t elem = NULL;
+    surf_action_network_CM02_t action = NULL;
+
     nw_link->bw_current = value;
     lmm_update_constraint_bound(network_maxmin_system, nw_link->constraint,
-				nw_link->bw_current);
+				bandwidth_factor*nw_link->bw_current);
+    if(weight_S_parameter>0) {
+      while ((var= lmm_get_var_from_cnst
+	      (network_maxmin_system, nw_link->constraint, &elem))) {
+	action = lmm_variable_id(var);
+	action->weight += delta;
+	if (!(action->suspended))
+	  lmm_update_variable_weight(network_maxmin_system, action->variable,
+				     action->weight);
+      }
+    }
   } else if (event_type == nw_link->lat_event) {
     double delta = value - nw_link->lat_current;
     lmm_variable_t var = NULL;
@@ -461,6 +464,7 @@ static void update_resource_state(void *id,
 	   (network_maxmin_system, nw_link->constraint, &elem))) {
       action = lmm_variable_id(var);
       action->lat_current += delta;
+      action->weight += delta;
       if (action->rate < 0)
 	lmm_update_variable_bound(network_maxmin_system, action->variable,
 				  SG_TCP_CTE_GAMMA / (2.0 *
@@ -474,9 +478,8 @@ static void update_resource_state(void *id,
 							  lat_current)));
       if (!(action->suspended))
 	lmm_update_variable_weight(network_maxmin_system, action->variable,
-				   action->lat_current);
-      lmm_update_variable_latency(network_maxmin_system, action->variable,
-				  delta);
+				   action->weight);
+
     }
   } else if (event_type == nw_link->state_event) {
     if (value > 0)
@@ -530,7 +533,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;
@@ -553,11 +556,15 @@ static surf_action_t communicate(void *src, void *dst, double size,
   action->rate = rate;
 
   action->latency = 0.0;
-  for (i = 0; i < route_size; i++)
+  action->weight = 0.0;
+  for (i = 0; i < route_size; i++) {
     action->latency += route[i]->lat_current;
+    action->weight += route[i]->lat_current + weight_S_parameter/route[i]->bw_current;
+  }
   /* LARGE PLATFORMS HACK:
      Add src->link and dst->link latencies */
   action->lat_current = action->latency;
+  action->latency *= latency_factor;
 
   /* LARGE PLATFORMS HACK:
      lmm_variable_new(..., total_route_size)*/
@@ -589,8 +596,6 @@ static surf_action_t communicate(void *src, void *dst, double size,
       lmm_update_variable_bound(network_maxmin_system, action->variable,
 				action->rate);
   }
-  lmm_update_variable_latency(network_maxmin_system, action->variable,
-			      action->latency);
 
   for (i = 0; i < route_size; i++)
     lmm_expand(network_maxmin_system, route[i]->constraint,
@@ -633,6 +638,11 @@ static double get_link_latency(const void *link)
   return ((link_CM02_t) link)->lat_current;
 }
 
+static int link_shared(const void *link)
+{
+  return lmm_constraint_is_shared(((link_CM02_t) link)->constraint);
+}
+
 static xbt_dict_t get_properties(void *link)
 {
  return ((link_CM02_t) link)->properties;
@@ -653,7 +663,7 @@ static void action_resume(surf_action_t action)
 			       ((surf_action_network_CM02_t) action)->
 			       variable,
 			       ((surf_action_network_CM02_t) action)->
-			       lat_current);
+			       weight);
     ((surf_action_network_CM02_t) action)->suspended = 0;
   }
 }
@@ -765,6 +775,8 @@ static void surf_network_model_init_internal(void)
       get_link_bandwidth;
   surf_network_model->extension_public->get_link_latency =
       get_link_latency;
+  surf_network_model->extension_public->link_shared =
+      link_shared;
 
   surf_network_model->common_public->get_properties =  get_properties;
 
@@ -775,6 +787,28 @@ static void surf_network_model_init_internal(void)
     network_maxmin_system = lmm_system_new();
 }
 
+/************************************************************************/
+/* New model based on optimizations discussed during this thesis        */
+/************************************************************************/
+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;
+
+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+
+  update_model_description(surf_network_model_description,
+			   "LegrandVelho",
+			   (surf_model_t) surf_network_model);
+}
+
 /***************************************************************************/
 /* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */
 /***************************************************************************/
@@ -854,7 +888,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;
@@ -869,18 +903,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