X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27680c02b4e665650698b64e4da27bc1cbfc2752..24c6654fe2f837c359af9fc74e7717b2bd73b3c7:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 531dbbbe58..fd42c0ca34 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -7,6 +7,7 @@
 
 #include "network_private.h"
 #include "xbt/log.h"
+#include "xbt/str.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
 				"Logging specific to the SURF network module");
@@ -14,11 +15,15 @@ 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 */
+double weight_S_parameter = 0.0; /* default value */
+
 int card_number = 0;
+int host_number = 0;
 link_CM02_t **routing_table = NULL;
 int *routing_table_size = NULL;
 static link_CM02_t loopback = NULL;
@@ -26,29 +31,31 @@ static link_CM02_t loopback = NULL;
 static void create_routing_table(void)
 {
   routing_table =
-      xbt_new0(link_CM02_t *, card_number * card_number);
-  routing_table_size = xbt_new0(int, card_number * card_number);
+      xbt_new0(link_CM02_t *, /*card_number * card_number */ host_number * host_number);
+  routing_table_size = xbt_new0(int, /*card_number * card_number*/ host_number * host_number);
 }
 
 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);
 }
 
 static link_CM02_t link_new(char *name,
-					    double bw_initial,
-					    tmgr_trace_t bw_trace,
-					    double lat_initial,
-					    tmgr_trace_t lat_trace,
-					    e_surf_link_state_t
-					    state_initial,
-					    tmgr_trace_t state_trace,
-					    e_surf_link_sharing_policy_t
-					    policy, xbt_dict_t properties)
+			    double bw_initial,
+			    tmgr_trace_t bw_trace,
+			    double lat_initial,
+			    tmgr_trace_t lat_trace,
+			    e_surf_link_state_t
+			    state_initial,
+			    tmgr_trace_t state_trace,
+			    e_surf_link_sharing_policy_t
+			    policy, xbt_dict_t properties)
 {
   link_CM02_t nw_link = xbt_new0(s_link_CM02_t, 1);
-
+  xbt_assert1(!xbt_dict_get_or_null(link_set, name), 
+	      "Link '%s' declared several times in the platform file.", name);   
 
   nw_link->model = (surf_model_t) surf_network_model;
   nw_link->name = name;
@@ -67,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);
@@ -95,7 +102,7 @@ static int network_card_new(const char *card_name)
   if (!card) {
     card = xbt_new0(s_network_card_CM02_t, 1);
     card->name = xbt_strdup(card_name);
-    card->id = card_number++;
+    card->id = host_number++;
     xbt_dict_set(network_card_set, card_name, card, network_card_free);
   }
   return card->id;
@@ -151,72 +158,31 @@ static void parse_link_init(void)
 
 }
 
-static int nb_link;
-static int link_list_capacity;
-static link_CM02_t *link_list = NULL;
 static int src_id = -1;
 static int dst_id = -1;
 
 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);
-  nb_link = 0;
-  link_list_capacity = 20;
-  link_list = xbt_new(link_CM02_t, link_list_capacity);
-}
-
-static void parse_route_elem(void)
-{
-
-  if (nb_link == link_list_capacity) {
-    link_list_capacity *= 2;
-    link_list =
-	xbt_realloc(link_list,
-		    (link_list_capacity) * sizeof(link_CM02_t));
-  }
-  link_list[nb_link++] =
-      xbt_dict_get_or_null(link_set, A_surfxml_link_c_ctn_id);
+  route_action = A_surfxml_route_action;
 }
 
 static void parse_route_set_route(void)
 {
-  route_new(src_id, dst_id, link_list, nb_link);
+  char *name;
+  if (src_id != -1 && dst_id != -1) {
+    name = bprintf("%x#%x",src_id, dst_id);
+    manage_route(route_table, name, route_action, 0);
+    free(name);    
+  }
 }
 
-static void parse_file(const char *file)
+static void add_loopback(void)
 {
   int i;
-  /* Figuring out the network links */
-  surf_parse_reset_parser();
-  surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
-  surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  /* Figuring out the network cards used */
-  surf_parse_reset_parser();
-  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints);
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
-  create_routing_table();
-
-  /* Building the routes */
-  surf_parse_reset_parser();
-  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);
-  surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
-  surf_parse_close();
-
   /* Adding loopback if needed */
-
-  for (i = 0; i < card_number; i++)
+  for (i = 0; i < host_number; i++)
     if (!ROUTE_SIZE(i, i)) {
       if (!loopback)
 	loopback = link_new(xbt_strdup("__MSG_loopback__"),
@@ -229,6 +195,103 @@ static void parse_file(const char *file)
     }
 }
 
+static void add_route(void)
+{
+  xbt_ex_t e;
+  int nb_link = 0;
+  unsigned int cpt = 0;    
+  int link_list_capacity = 0;
+  link_CM02_t *link_list = NULL;
+  xbt_dict_cursor_t cursor = NULL;
+  char *key,*data, *end;
+  const char *sep = "#";
+  xbt_dynar_t links, keys;
+
+  if (routing_table == NULL) create_routing_table();
+
+  xbt_dict_foreach(route_table, cursor, key, data) {
+	  char* link = NULL;
+    nb_link = 0;
+    links = (xbt_dynar_t)data;
+    keys = xbt_str_split_str(key, sep);
+
+    link_list_capacity = xbt_dynar_length(links);
+    link_list = xbt_new(link_CM02_t, link_list_capacity);
+
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
+    xbt_dynar_free(&keys);
+ 
+    xbt_dynar_foreach (links, cpt, link) {
+      TRY {
+	link_list[nb_link++] = xbt_dict_get(link_set, link);
+      }
+      CATCH(e) {
+        RETHROW1("Link %s not found (dict raised this exception: %s)", link);
+      }     
+    }
+    route_new(src_id, dst_id, link_list, nb_link);
+   }
+}
+
+static void count_hosts(void)
+{
+   host_number++;
+}
+
+
+static void add_traces(void) {
+   xbt_dict_cursor_t cursor=NULL;
+   char *trace_name,*elm;
+   
+   static int called = 0;
+   if (called) return;
+   called = 1;
+
+   /* connect all traces relative to network */
+   xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
+      tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+      link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
+      
+      xbt_assert1(link, "Link %s undefined", elm);
+      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      
+      link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
+   }
+
+   xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
+      tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+      link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
+      
+      xbt_assert1(link, "Link %s undefined", elm);
+      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      
+      link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
+   }
+   
+   xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
+      tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
+      link_CM02_t link = xbt_dict_get_or_null(link_set, elm);
+      
+      xbt_assert1(link, "Link %s undefined", elm);
+      xbt_assert1(trace, "Trace %s undefined", trace_name);
+      
+      link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
+   }
+}
+
+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_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);
+}
+
 static void *name_service(const char *name)
 {
   network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
@@ -249,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,
@@ -263,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)
@@ -303,6 +366,8 @@ static double share_resources(double now)
 				       network_maxmin_system,
 				       network_solve);
 
+#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + xbt_swag_offset(s_action, variable)  )))
+  
   xbt_swag_foreach(action, running_actions) {
     if (action->latency > 0) {
       if (min < 0)
@@ -339,15 +404,13 @@ 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);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
       double_update(&(action->generic_action.max_duration), delta);
 
-    /*   if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
-
     if ((action->generic_action.remains <= 0) &&
 	(lmm_get_variable_weight(action->variable) > 0)) {
       action->generic_action.finish = surf_get_clock();
@@ -356,21 +419,6 @@ static void update_actions_state(double now, double delta)
 	       (action->generic_action.max_duration <= 0)) {
       action->generic_action.finish = surf_get_clock();
       action_change_state((surf_action_t) action, SURF_ACTION_DONE);
-    } else {			/* Need to check that none of the model has failed */
-      lmm_constraint_t cnst = NULL;
-      int i = 0;
-      link_CM02_t nw_link = NULL;
-
-      while ((cnst =
-	      lmm_get_cnst_from_var(network_maxmin_system,
-				    action->variable, i++))) {
-	nw_link = lmm_constraint_id(cnst);
-	if (nw_link->state_current == SURF_LINK_OFF) {
-	  action->generic_action.finish = surf_get_clock();
-	  action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
-	  break;
-	}
-      }
     }
   }
 
@@ -379,7 +427,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
 				  tmgr_trace_event_t event_type,
-				  double value)
+				  double value, double date)
 {
   link_CM02_t nw_link = id;
   /*   printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
@@ -387,19 +435,36 @@ 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;
+    lmm_element_t elem = NULL;
     surf_action_network_CM02_t action = NULL;
 
     nw_link->lat_current = value;
-    while (lmm_get_var_from_cnst
-	   (network_maxmin_system, nw_link->constraint, &var)) {
+    while ((var= lmm_get_var_from_cnst
+	   (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 *
@@ -413,15 +478,29 @@ 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)
       nw_link->state_current = SURF_LINK_ON;
-    else
+    else {
+      lmm_constraint_t cnst = nw_link->constraint;
+      lmm_variable_t var = NULL;
+      lmm_element_t elem = NULL;
+
       nw_link->state_current = SURF_LINK_OFF;
+      while ((var= lmm_get_var_from_cnst
+	      (network_maxmin_system, cnst, &elem))) {
+	surf_action_t action = lmm_variable_id(var) ;
+
+	if(surf_action_get_state(action)==SURF_ACTION_RUNNING ||
+	   surf_action_get_state(action)==SURF_ACTION_READY) {
+	  action->finish = date;
+	  action_change_state( action, SURF_ACTION_FAILED);
+	}
+      }
+    }
   } else {
     CRITICAL0("Unknown event ! \n");
     xbt_abort();
@@ -434,20 +513,27 @@ static surf_action_t communicate(void *src, void *dst, double size,
 				 double rate)
 {
   surf_action_network_CM02_t action = NULL;
+  /* LARGE PLATFORMS HACK:
+     Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node
+     Use the cluster_id for ->id */
   network_card_CM02_t card_src = src;
   network_card_CM02_t card_dst = dst;
   int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
   link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
+  /* LARGE PLATFORMS HACK:
+     total_route_size = route_size + src->link_nb + dst->nb */
   int i;
 
   XBT_IN4("(%s,%s,%g,%g)", card_src->name, card_dst->name, size, rate);
+  /* LARGE PLATFORMS HACK:
+     assert on total_route_size */
   xbt_assert2(route_size,
 	      "You're trying to send data from %s to %s but there is no connexion between these two cards.",
 	      card_src->name, card_dst->name);
 
   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;
@@ -459,15 +545,29 @@ static surf_action_t communicate(void *src, void *dst, double size,
 				   calloc but it seems to help valgrind... */
   action->generic_action.state_set =
       surf_network_model->common_public->states.running_action_set;
-
+  for (i = 0; i < route_size; i++) 
+    if(route[i]->state_current == SURF_LINK_OFF) {
+      action->generic_action.state_set =
+	surf_network_model->common_public->states.failed_action_set;
+      break;
+    }
+  
   xbt_swag_insert(action, action->generic_action.state_set);
   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)*/
   if (action->latency > 0)
     action->variable =
 	lmm_variable_new(network_maxmin_system, action, 0.0, -1.0,
@@ -496,12 +596,13 @@ 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,
 	       action->variable, 1.0);
+  /* LARGE PLATFORMS HACK:
+     expand also with src->link and dst->link */
+
   XBT_OUT;
 
   return (surf_action_t) action;
@@ -537,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;
@@ -557,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;
   }
 }
@@ -594,14 +700,16 @@ static void finalize(void)
   surf_network_model = NULL;
 
   loopback = NULL;
-  for (i = 0; i < card_number; i++)
-    for (j = 0; j < card_number; j++)
+  for (i = 0; i < host_number; i++)
+    for (j = 0; j < host_number; j++)
       free(ROUTE(i, j));
   free(routing_table);
   routing_table = NULL;
   free(routing_table_size);
   routing_table_size = NULL;
-  card_number = 0;
+  host_number = 0;
+  lmm_system_free(network_maxmin_system);
+  network_maxmin_system = NULL;
 }
 
 static void surf_network_model_init_internal(void)
@@ -667,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;
 
@@ -677,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 */
 /***************************************************************************/
@@ -694,14 +826,13 @@ void surf_network_model_init_CM02(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);
   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)
@@ -709,17 +840,42 @@ void surf_network_model_init_Reno(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_reno_f, func_reno_fp,
 				    func_reno_fpi);
   network_solve = lagrange_solve;
 
+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+
   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);
+}
+
+
+void surf_network_model_init_Reno2(const char *filename)
+{
+  if (surf_network_model)
+    return;
+  surf_network_model_init_internal();
+  define_callbacks(filename);
+
+  xbt_dynar_push(model_list, &surf_network_model);
+  lmm_set_default_protocol_function(func_reno2_f, func_reno2_fp,
+				    func_reno2_fpi);
+  network_solve = lagrange_solve;
+
+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+
+  update_model_description(surf_network_model_description,
+			   "Reno2",
+			   (surf_model_t) surf_network_model);
 }
 
 void surf_network_model_init_Vegas(const char *filename)
@@ -727,33 +883,35 @@ void surf_network_model_init_Vegas(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_vegas_f, func_vegas_fp,
 				    func_vegas_fpi);
   network_solve = lagrange_solve;
 
+  latency_factor = 10.4;
+  bandwidth_factor = 0.92;
+  weight_S_parameter = 8775;
+
   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;
   surf_network_model_init_internal();
-  parse_file(filename);
+  define_callbacks(filename);
 
   xbt_dynar_push(model_list, &surf_network_model);
   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