X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a148ae3a296d7cf7532fa636e659a860ad3f943..bda6e0c064e2ebbac5dc3b5f780bb5e6cb61e9b0:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 3535d2bb6f..7f207d0d23 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -15,10 +15,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
 surf_network_model_t surf_network_model = NULL;
 static lmm_system_t network_maxmin_system = NULL;
 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 */
+
+
 int card_number = 0;
 int host_number = 0;
 link_CM02_t **routing_table = NULL;
@@ -35,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);
 }
 
@@ -70,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);
@@ -162,7 +166,6 @@ static void parse_route_set_endpoints(void)
   src_id = network_card_new(A_surfxml_route_src);
   dst_id = network_card_new(A_surfxml_route_dst);
   route_action = A_surfxml_route_action;
-  route_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
 
 static void parse_route_set_route(void)
@@ -229,9 +232,6 @@ static void add_route(void)
     }
     route_new(src_id, dst_id, link_list, nb_link);
    }
-
-   xbt_dict_free(&route_table);
-
 }
 
 static void count_hosts(void)
@@ -278,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)
@@ -293,22 +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_link_c_ctn_cb_list, &parse_route_elem);
   surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route);
-  surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data);
   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)
@@ -331,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,
@@ -345,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)
@@ -456,7 +437,7 @@ static void update_resource_state(void *id,
   if (event_type == nw_link->bw_event) {
     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);
   } else if (event_type == nw_link->lat_event) {
     double delta = value - nw_link->lat_current;
     lmm_variable_t var = NULL;
@@ -482,8 +463,7 @@ static void update_resource_state(void *id,
       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);
+
     }
   } else if (event_type == nw_link->state_event) {
     if (value > 0)
@@ -537,7 +517,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,6 +545,8 @@ static surf_action_t communicate(void *src, void *dst, double size,
   /* 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)*/
@@ -596,8 +578,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,
@@ -640,6 +620,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;
@@ -705,6 +690,8 @@ static void finalize(void)
   free(routing_table_size);
   routing_table_size = NULL;
   host_number = 0;
+  lmm_system_free(network_maxmin_system);
+  network_maxmin_system = NULL;
 }
 
 static void surf_network_model_init_internal(void)
@@ -770,6 +757,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;
 
@@ -780,6 +769,27 @@ 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;
+
+  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 */
 /***************************************************************************/
@@ -802,9 +812,8 @@ void surf_network_model_init_CM02(const char *filename)
   network_solve = lmm_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "CM02",
-			      (surf_model_t) surf_network_model);
+			   "CM02",
+			   (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Reno(const char *filename)
@@ -820,9 +829,8 @@ void surf_network_model_init_Reno(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "Reno",
-			      (surf_model_t) surf_network_model);
+			   "Reno",
+			   (surf_model_t) surf_network_model);
 }
 
 
@@ -831,7 +839,7 @@ void surf_network_model_init_Reno2(const char *filename)
   if (surf_network_model)
     return;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   xbt_dynar_push(model_list, &surf_network_model);
   lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
@@ -839,9 +847,8 @@ void surf_network_model_init_Reno2(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "Reno2",
-			      (surf_model_t) surf_network_model);
+			   "Reno2",
+			   (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Vegas(const char *filename)
@@ -857,13 +864,12 @@ void surf_network_model_init_Vegas(const char *filename)
   network_solve = lagrange_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "Vegas",
-			      (surf_model_t) surf_network_model);
+			   "Vegas",
+			   (surf_model_t) surf_network_model);
 }
 
 #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;
@@ -874,8 +880,7 @@ void surf_network_model_init_SDP(const char *filename)
   network_solve = sdp_solve;
 
   update_model_description(surf_network_model_description,
-			      surf_network_model_description_size,
-			      "SDP",
-			      (surf_model_t) surf_network_model);
+			   "SDP",
+			   (surf_model_t) surf_network_model);
 }
 #endif