X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b91f70d7c653c348d1b7c2a33c17b8c759d21709..2eae9b903fa523a15a5c8b4adb4471b6bd1e0af1:/src/surf/network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index b88265c36d..56b4dd8d2b 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -32,10 +32,11 @@ static void create_routing_table(void)
 
 static void network_link_free(void *nw_link)
 {
+  xbt_free(((network_link_t)nw_link)->name);
   xbt_free(nw_link);
 }
 
-static network_link_t network_link_new(const char *name,
+static network_link_t network_link_new(char *name,
 				       double bw_initial,
 				       tmgr_trace_t bw_trace,
 				       double lat_initial,
@@ -70,6 +71,12 @@ static network_link_t network_link_new(const char *name,
   return nw_link;
 }
 
+static void network_card_free(void *nw_card)
+{
+  xbt_free(((network_card_t)nw_card)->name);
+  xbt_free(nw_card);
+}
+
 static int network_card_new(const char *card_name)
 {
   network_card_t card = NULL;
@@ -80,7 +87,7 @@ static int network_card_new(const char *card_name)
     card = xbt_new0(s_network_card_t, 1);
     card->name = xbt_strdup(card_name);
     card->id = card_number++;
-    xbt_dict_set(network_card_set, card_name, card, NULL);
+    xbt_dict_set(network_card_set, card_name, card, network_card_free);
   }
   return card->id;
 }
@@ -99,148 +106,86 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link)
   xbt_free(links);
 }
 
-/*  
-   Semantic:  name       initial   bandwidth   initial   latency    initial     state
-                        bandwidth    trace     latency    trace      state      trace
-   
-   Token:   TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD TOKEN_WORD
-   Type:     string      double      string    double     string     ON/OFF     string
-*/
 static void parse_network_link(void)
 {
-  e_surf_token_t token;
   char *name;
   double bw_initial;
   tmgr_trace_t bw_trace;
   double lat_initial;
   tmgr_trace_t lat_trace;
-  e_surf_network_link_state_t state_initial;
+  e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
   tmgr_trace_t state_trace;
 
-  name = xbt_strdup(surf_parse_text);
+  name = xbt_strdup(A_network_link_name);
+  surf_parse_get_double(&bw_initial,A_network_link_bandwidth);
+  surf_parse_get_trace(&bw_trace, A_network_link_bandwidth_file);
+  surf_parse_get_double(&lat_initial,A_network_link_latency);
+  surf_parse_get_trace(&lat_trace, A_network_link_latency_file);
 
-  surf_parse_double(&bw_initial);
-  surf_parse_trace(&bw_trace);
-  surf_parse_double(&lat_initial);
-  surf_parse_trace(&lat_trace);
-
-  token = surf_parse();		/* state_initial */
-  xbt_assert1((token == TOKEN_WORD), "Parse error line %d", surf_line_pos);
-  if (strcmp(surf_parse_text, "ON") == 0)
+  xbt_assert0((A_network_link_state==A_network_link_state_ON)||
+	      (A_network_link_state==A_network_link_state_OFF),
+	      "Invalid state")
+  if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
-  else if (strcmp(surf_parse_text, "OFF") == 0)
+  if (A_network_link_state==A_network_link_state_OFF) 
     state_initial = SURF_NETWORK_LINK_OFF;
-  else {
-    CRITICAL2("Invalid cpu state (line %d): %s neq ON or OFF\n", surf_line_pos,
-	      surf_parse_text);
-    xbt_abort();
-  }
-
-  surf_parse_trace(&state_trace);
+  surf_parse_get_trace(&state_trace,A_network_link_state_file);
 
   network_link_new(name, bw_initial, bw_trace,
 		   lat_initial, lat_trace, state_initial, state_trace);
 }
 
-/*  
-   Semantic:  source   destination           network
-                                              links
-   
-   Token:   TOKEN_WORD TOKEN_WORD TOKEN_LP TOKEN_WORD* TOKEN_RP
-   Type:     string       string             string
-*/
-static void parse_route(int fake)
+static int nb_link = 0;
+static char **link_name = NULL;
+static int src_id = -1;
+static int dst_id = -1;
+
+static void parse_route_set_endpoints(void)
 {
-  int src_id = -1;
-  int dst_id = -1;
-  int nb_link = 0;
-  char **link_name = NULL;
-  e_surf_token_t token;
-
-  src_id = network_card_new(surf_parse_text);
-
-  token = surf_parse();
-  xbt_assert1((token == TOKEN_WORD), "Parse error line %d", surf_line_pos);
-  dst_id = network_card_new(surf_parse_text);
-
-  token = surf_parse();
-  xbt_assert1((token == TOKEN_LP), "Parse error line %d", surf_line_pos);
-
-  while ((token = surf_parse()) == TOKEN_WORD) {
-    if (!fake) {
-      nb_link++;
-      link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
-      link_name[(nb_link) - 1] = xbt_strdup(surf_parse_text);
-    }
-  }
-  xbt_assert1((token == TOKEN_RP), "Parse error line %d", surf_line_pos);
+  src_id = network_card_new(A_route_src);
+  dst_id = network_card_new(A_route_dst);
+  nb_link = 0;
+  link_name = NULL;
+}
 
-  if (!fake)
-    route_new(src_id, dst_id, link_name, nb_link);
+static void parse_route_elem(void)
+{
+  nb_link++;
+  link_name = xbt_realloc(link_name, (nb_link) * sizeof(char *));
+  link_name[(nb_link) - 1] = xbt_strdup(A_route_element_name);
+}
+
+static void parse_route_set_route(void)
+{
+  route_new(src_id, dst_id, link_name, nb_link);
 }
 
 static void parse_file(const char *file)
 {
-  e_surf_token_t token;
-
-  /* Figuring out the network links in the system */
-  find_section(file, "NETWORK");
-  while (1) {
-    token = surf_parse();
-
-    if (token == TOKEN_END_SECTION)
-      break;
-    if (token == TOKEN_NEWLINE)
-      continue;
-
-    if (token == TOKEN_WORD)
-      parse_network_link();
-    else {
-      CRITICAL1("Parse error line %d\n", surf_line_pos);
-      xbt_abort();
-    }
-  }
-  close_section("NETWORK");
+  /* Figuring out the network links */
+  surf_parse_reset_parser();
+  ETag_network_link_fun=parse_network_link;
+  surf_parse_open(file);
+  xbt_assert1((!surf_parse()),"Parse error in %s",file);
+  surf_parse_close();
 
   /* Figuring out the network cards used */
-  find_section(file, "ROUTE");
-  while (1) {
-    token = surf_parse();
-
-    if (token == TOKEN_END_SECTION)
-      break;
-    if (token == TOKEN_NEWLINE)
-      continue;
-
-    if (token == TOKEN_WORD)
-      parse_route(1);
-    else {
-      CRITICAL1("Parse error line %d\n", surf_line_pos);
-      xbt_abort();
-    }
-  }
-  close_section("ROUTE");
+  surf_parse_reset_parser();
+  STag_route_fun=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 */
-  find_section(file, "ROUTE");
-  while (1) {
-    token = surf_parse();
-
-    if (token == TOKEN_END_SECTION)
-      break;
-    if (token == TOKEN_NEWLINE)
-      continue;
-
-    if (token == TOKEN_WORD)
-      parse_route(0);
-    else {
-      CRITICAL1("Parse error line %d\n", surf_line_pos);
-      xbt_abort();
-    }
-  }
-  close_section("ROUTE");
+  surf_parse_reset_parser();
+  STag_route_fun=parse_route_set_endpoints;
+  ETag_route_element_fun=parse_route_elem;
+  ETag_route_fun=parse_route_set_route;
+  surf_parse_open(file);
+  xbt_assert1((!surf_parse()),"Parse error in %s",file);
+  surf_parse_close();
 }
 
 static void *name_service(const char *name)
@@ -293,11 +238,20 @@ static void action_change_state(surf_action_t action,
 
 static double share_resources(double now)
 {
-  s_surf_action_network_t action;
-  return generic_maxmin_share_resources(surf_network_resource->
-					common_public->states.
-					running_action_set,
-					xbt_swag_offset(action, variable));
+  s_surf_action_network_t s_action;
+  surf_action_network_t action = NULL;
+  xbt_swag_t running_actions = surf_network_resource->common_public->states.running_action_set;
+  double min = generic_maxmin_share_resources(running_actions,
+					      xbt_swag_offset(s_action, variable));
+
+  xbt_swag_foreach(action, running_actions) {
+    if(action->latency>0) {
+      if(min<0) min = action->latency;
+      else if (action->latency<min) min = action->latency;
+    }
+  }
+
+  return min;
 }
 
 
@@ -321,13 +275,15 @@ static void update_actions_state(double now, double delta)
 	deltap -= action->latency;
 	action->latency = 0.0;
       }
+      if ((action->latency == 0.0) && !(action->suspended)) 
+	lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
     }
     action->generic_action.remains -=
 	lmm_variable_getvalue(action->variable) * deltap;
     if (action->generic_action.max_duration != NO_MAX_DURATION)
       action->generic_action.max_duration -= delta;
 
-/*     if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
+    /*   if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
 
     if (action->generic_action.remains <= 0) {
       action->generic_action.finish = surf_get_clock();
@@ -366,10 +322,9 @@ static void update_resource_state(void *id,
 				  double value)
 {
   network_link_t nw_link = id;
-
-/*   printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
-/* 	 "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */
-/* 	 value, event_type); */
+  /*   printf("[" "%lg" "] Asking to update network card \"%s\" with value " */
+  /* 	 "%lg" " for event %p\n", surf_get_clock(), nw_link->name, */
+  /* 	 value, event_type); */
 
   if (event_type == nw_link->bw_event) {
     nw_link->bw_current = value;
@@ -416,7 +371,6 @@ static surf_action_t communicate(void *src, void *dst, double size)
   action->generic_action.max_duration = NO_MAX_DURATION;
   action->generic_action.start = -1.0;
   action->generic_action.finish = -1.0;
-  action->generic_action.callback = NULL;
   action->generic_action.resource_type =
       (surf_resource_t) surf_network_resource;
 
@@ -425,23 +379,50 @@ static surf_action_t communicate(void *src, void *dst, double size)
 
   xbt_swag_insert(action, action->generic_action.state_set);
 
-  action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
-				      route_size);
-  for (i = 0; i < route_size; i++)
-    lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
-
   action->latency = 0.0;
   for (i = 0; i < route_size; i++)
     action->latency += route[i]->lat_current;
   action->lat_current = action->latency;
+
+  if(action->latency>0)
+    action->variable = lmm_variable_new(maxmin_system, action, 0.0, -1.0,
+					route_size);
+  else 
+    action->variable = lmm_variable_new(maxmin_system, action, 1.0, -1.0,
+					route_size);
+
   lmm_update_variable_bound(maxmin_system, action->variable,
 			    SG_TCP_CTE_GAMMA / action->lat_current);
 
+  for (i = 0; i < route_size; i++)
+    lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
+
   return (surf_action_t) action;
 }
 
+static void action_suspend(surf_action_t action)
+{
+  ((surf_action_network_t) action)->suspended = 1;
+  lmm_update_variable_weight(maxmin_system,
+			     ((surf_action_network_t) action)->variable, 0.0);
+}
+
+static void action_resume(surf_action_t action)
+{
+  lmm_update_variable_weight(maxmin_system,
+			     ((surf_action_network_t) action)->variable, 1.0);
+  ((surf_action_network_t) action)->suspended = 0;
+}
+
+static int action_is_suspended(surf_action_t action)
+{
+  return ((surf_action_network_t) action)->suspended;
+}
+
 static void finalize(void)
 {
+  int i,j;
+
   xbt_dict_free(&network_card_set);
   xbt_dict_free(&network_link_set);
   xbt_swag_free(surf_network_resource->common_public->states.
@@ -458,6 +439,15 @@ static void finalize(void)
 
   xbt_free(surf_network_resource);
   surf_network_resource = NULL;
+
+  for (i = 0; i < card_number; i++) 
+    for (j = 0; j < card_number; j++) 
+      xbt_free(ROUTE(i,j));
+  xbt_free(routing_table);
+  routing_table = NULL;
+  xbt_free(routing_table_size);
+  routing_table_size = NULL;
+  card_number = 0;
 }
 
 static void surf_network_resource_init_internal(void)
@@ -470,7 +460,6 @@ static void surf_network_resource_init_internal(void)
       xbt_new0(s_surf_resource_private_t, 1);
   surf_network_resource->common_public =
       xbt_new0(s_surf_resource_public_t, 1);
-/*   surf_network_resource->extension_private = xbt_new0(s_surf_network_resource_extension_private_t,1); */
   surf_network_resource->extension_public =
       xbt_new0(s_surf_network_resource_extension_public_t, 1);
 
@@ -493,6 +482,7 @@ static void surf_network_resource_init_internal(void)
   surf_network_resource->common_public->action_recycle = action_recycle;
   surf_network_resource->common_public->action_change_state =
       action_change_state;
+  surf_network_resource->common_public->action_set_data = surf_action_set_data;
   surf_network_resource->common_public->name = "network";
 
   surf_network_resource->common_private->resource_used = resource_used;
@@ -504,6 +494,9 @@ static void surf_network_resource_init_internal(void)
   surf_network_resource->common_private->finalize = finalize;
 
   surf_network_resource->extension_public->communicate = communicate;
+  surf_network_resource->extension_public->suspend = action_suspend;
+  surf_network_resource->extension_public->resume = action_resume;
+  surf_network_resource->extension_public->is_suspended = action_is_suspended;
 
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();
@@ -511,7 +504,18 @@ static void surf_network_resource_init_internal(void)
   xbt_assert0(maxmin_system, "surf_init has to be called first!");
 }
 
-void surf_network_resource_init(const char *filename)
+/***************************************************************************/
+/* The nice TCP sharing model designed by Loris Marchal and Henri Casanova */
+/***************************************************************************/
+/* @TechReport{      rr-lip2002-40, */
+/*   author        = {Henri Casanova and Loris Marchal}, */
+/*   institution   = {LIP}, */
+/*   title         = {A Network Model for Simulation of Grid Application}, */
+/*   number        = {2002-40}, */
+/*   month         = {oct}, */
+/*   year          = {2002} */
+/* } */
+void surf_network_resource_init_CM02(const char *filename)
 {
   if (surf_network_resource)
     return;