X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6837e7db7bc9c7d5b1924441d1bfcc2ec8e2fd6..6604439f3437486f84c0e239f28b162662631127:/src/surf/network_dassf.c

diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index 23471c91a5..c0a6c07812 100644
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -7,10 +7,7 @@
 
 #include "network_dassf_private.h"
 
-#define SG_TCP_CTE_GAMMA 20000.0
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network_dassf, surf,
-				"Logging specific to the SURF network module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 /* surf_network_resource_t surf_network_resource = NULL; */
 static xbt_dict_t network_link_set = NULL;
@@ -31,8 +28,8 @@ static void create_routing_table(void)
 
 static void network_link_free(void *nw_link)
 {
-  xbt_free(((network_link_DASSF_t)nw_link)->name);
-  xbt_free(nw_link);
+  free(((network_link_DASSF_t)nw_link)->name);
+  free(nw_link);
 }
 
 static network_link_DASSF_t network_link_new(char *name,
@@ -72,15 +69,13 @@ static network_link_DASSF_t network_link_new(char *name,
 
 static void network_card_free(void *nw_card)
 {
-  xbt_free(((network_card_DASSF_t)nw_card)->name);
-  xbt_free(nw_card);
+  free(((network_card_DASSF_t)nw_card)->name);
+  free(nw_card);
 }
 
 static int network_card_new(const char *card_name)
 {
-  network_card_DASSF_t card = NULL;
-
-  xbt_dict_get(network_card_set, card_name, (void *) &card);
+  network_card_DASSF_t card = xbt_dict_get_or_null(network_card_set, card_name);
 
   if (!card) {
     card = xbt_new0(s_network_card_DASSF_t, 1);
@@ -99,10 +94,10 @@ static void route_new(int src_id, int dst_id, char **links, int nb_link)
   ROUTE_SIZE(src_id, dst_id) = nb_link;
   link_list = (ROUTE(src_id, dst_id) = xbt_new0(network_link_DASSF_t, nb_link));
   for (i = 0; i < nb_link; i++) {
-    xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
-    xbt_free(links[i]);
+    link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
+    free(links[i]);
   }
-  xbt_free(links);
+  free(links);
 }
 
 static void parse_network_link(void)
@@ -115,20 +110,20 @@ static void parse_network_link(void)
   e_surf_network_link_state_t state_initial = SURF_NETWORK_LINK_ON;
   tmgr_trace_t state_trace;
 
-  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);
+  name = xbt_strdup(A_surfxml_network_link_name);
+  surf_parse_get_double(&bw_initial,A_surfxml_network_link_bandwidth);
+  surf_parse_get_trace(&bw_trace, A_surfxml_network_link_bandwidth_file);
+  surf_parse_get_double(&lat_initial,A_surfxml_network_link_latency);
+  surf_parse_get_trace(&lat_trace, A_surfxml_network_link_latency_file);
 
-  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) 
+  xbt_assert0((A_surfxml_network_link_state==A_surfxml_network_link_state_ON)||
+	      (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF),
+	      "Invalid state");
+  if (A_surfxml_network_link_state==A_surfxml_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
-  if (A_network_link_state==A_network_link_state_OFF) 
+  if (A_surfxml_network_link_state==A_surfxml_network_link_state_OFF) 
     state_initial = SURF_NETWORK_LINK_OFF;
-  surf_parse_get_trace(&state_trace,A_network_link_state_file);
+  surf_parse_get_trace(&state_trace,A_surfxml_network_link_state_file);
 
   network_link_new(name, bw_initial, bw_trace,
 		   lat_initial, lat_trace, state_initial, state_trace);
@@ -141,8 +136,8 @@ static int dst_id = -1;
 
 static void parse_route_set_endpoints(void)
 {
-  src_id = network_card_new(A_route_src);
-  dst_id = network_card_new(A_route_dst);
+  src_id = network_card_new(A_surfxml_route_src);
+  dst_id = network_card_new(A_surfxml_route_dst);
   nb_link = 0;
   link_name = NULL;
 }
@@ -151,7 +146,7 @@ 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);
+  link_name[(nb_link) - 1] = xbt_strdup(A_surfxml_route_element_name);
 }
 
 static void parse_route_set_route(void)
@@ -163,14 +158,14 @@ static void parse_file(const char *file)
 {
   /* Figuring out the network links */
   surf_parse_reset_parser();
-  ETag_network_link_fun=parse_network_link;
+  ETag_surfxml_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 */
   surf_parse_reset_parser();
-  STag_route_fun=parse_route_set_endpoints;
+  STag_surfxml_route_fun=parse_route_set_endpoints;
   surf_parse_open(file);
   xbt_assert1((!surf_parse()),"Parse error in %s",file);
   surf_parse_close();
@@ -179,9 +174,9 @@ static void parse_file(const char *file)
 
   /* Building the routes */
   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;
+  STag_surfxml_route_fun=parse_route_set_endpoints;
+  ETag_surfxml_route_element_fun=parse_route_elem;
+  ETag_surfxml_route_fun=parse_route_set_route;
   surf_parse_open(file);
   xbt_assert1((!surf_parse()),"Parse error in %s",file);
   surf_parse_close();
@@ -189,11 +184,7 @@ static void parse_file(const char *file)
 
 static void *name_service(const char *name)
 {
-  network_card_DASSF_t card = NULL;
-
-  xbt_dict_get(network_card_set, name, (void *) &card);
-
-  return card;
+  return xbt_dict_get_or_null(network_card_set, name);
 }
 
 static const char *get_resource_name(void *resource_id)
@@ -207,14 +198,16 @@ static int resource_used(void *resource_id)
 			     ((network_link_DASSF_t) resource_id)->constraint);
 }
 
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
 {
-  xbt_swag_remove(action, action->state_set);
-  if(((surf_action_network_DASSF_t)action)->variable)
-    lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
-  xbt_free(action);
-
-  return;
+  action->using--;
+  if(!action->using) {
+    xbt_swag_remove(action, action->state_set);
+    if(((surf_action_network_DASSF_t)action)->variable)
+      lmm_variable_free(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
+    free(action);
+  }
+  return 1;
 }
 
 static void action_cancel(surf_action_t action)
@@ -230,11 +223,11 @@ static void action_recycle(surf_action_t action)
 static void action_change_state(surf_action_t action,
 				e_surf_action_state_t state)
 {
-  if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED))
-    if(((surf_action_network_DASSF_t)action)->variable) {
-      lmm_variable_disable(maxmin_system, ((surf_action_network_DASSF_t)action)->variable);
-      ((surf_action_network_DASSF_t)action)->variable = NULL;
-    }
+/*   if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/*     if(((surf_action_network_DASSF_t)action)->variable) { */
+/*       lmm_variable_disable(maxmin_system, ((surf_action_network_DASSF_t)action)->variable); */
+/*       ((surf_action_network_DASSF_t)action)->variable = NULL; */
+/*     } */
 
   surf_action_change_state(action, state);
   return;
@@ -265,8 +258,10 @@ static void update_actions_state(double now, double delta)
   surf_action_network_DASSF_t next_action = NULL;
   xbt_swag_t running_actions =
       surf_network_resource->common_public->states.running_action_set;
+  /* KILLME: unused
   xbt_swag_t failed_actions =
       surf_network_resource->common_public->states.failed_action_set;
+  */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
     deltap = delta;
@@ -367,8 +362,11 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   network_link_DASSF_t *route = ROUTE(card_src->id, card_dst->id);
   int i;
 
+  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_DASSF_t, 1);
 
+  action->generic_action.using = 1;
   action->generic_action.cost = size;
   action->generic_action.remains = size;
   action->generic_action.max_duration = NO_MAX_DURATION;
@@ -445,19 +443,19 @@ static void finalize(void)
 		failed_action_set);
   xbt_swag_free(surf_network_resource->common_public->states.
 		done_action_set);
-  xbt_free(surf_network_resource->common_public);
-  xbt_free(surf_network_resource->common_private);
-  xbt_free(surf_network_resource->extension_public);
+  free(surf_network_resource->common_public);
+  free(surf_network_resource->common_private);
+  free(surf_network_resource->extension_public);
 
-  xbt_free(surf_network_resource);
+  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);
+      free(ROUTE(i,j));
+  free(routing_table);
   routing_table = NULL;
-  xbt_free(routing_table_size);
+  free(routing_table_size);
   routing_table_size = NULL;
   card_number = 0;
 }