Let's compile SURF once in the afternoon and cleanup the mess I've set by changing...

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 60f0dd0..202c2c6 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -6,6 +6,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "network_private.h"
+#include "xbt/log.h"
 
 #define SG_TCP_CTE_GAMMA 20000.0
 
@@ -20,6 +21,7 @@ xbt_dict_t network_card_set = NULL;
 int card_number = 0;
 network_link_CM02_t **routing_table = NULL;
 int *routing_table_size = NULL;
+static network_link_CM02_t loopback = NULL;
 
 static void create_routing_table(void)
 {
@@ -80,9 +82,7 @@ static void network_card_free(void *nw_card)
 
 static int network_card_new(const char *card_name)
 {
-  network_card_CM02_t card = NULL;
-
-  xbt_dict_get(network_card_set, card_name, (void *) &card);
+  network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, card_name);
 
   if (!card) {
     card = xbt_new0(s_network_card_CM02_t, 1);
@@ -101,7 +101,8 @@ 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_CM02_t, nb_link));
   for (i = 0; i < nb_link; i++) {
-    xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
+    link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
+    xbt_assert1(link_list[i],"Invalid link name \"%s\"",links[i]);
     free(links[i]);
   }
   free(links);
@@ -126,7 +127,7 @@ static void parse_network_link(void)
 
   xbt_assert0((A_network_link_state==A_network_link_state_ON)||
              (A_network_link_state==A_network_link_state_OFF),
-             "Invalid state")
+             "Invalid state");
   if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
   else if (A_network_link_state==A_network_link_state_OFF) 
@@ -171,6 +172,8 @@ static void parse_route_set_route(void)
 
 static void parse_file(const char *file)
 {
+  int i;
+
   /* Figuring out the network links */
   surf_parse_reset_parser();
   ETag_network_link_fun=parse_network_link;
@@ -195,14 +198,25 @@ static void parse_file(const char *file)
   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++) 
+    if(!ROUTE_SIZE(i,i)) {
+      if(!loopback)
+       loopback = network_link_new(xbt_strdup("__MSG_loopback__"), 
+                                  498.00, NULL, 0.000015, NULL, 
+                                  SURF_NETWORK_LINK_ON, NULL,
+                                  SURF_NETWORK_LINK_FATPIPE);
+      ROUTE_SIZE(i,i)=1;
+      ROUTE(i,i) = xbt_new0(network_link_CM02_t, 1);
+      ROUTE(i,i)[0] = loopback;
+    }
 }
 
 static void *name_service(const char *name)
 {
-  network_card_CM02_t card = NULL;
-
-  xbt_dict_get(network_card_set, name, (void *) &card);
-
+  network_card_CM02_t card = xbt_dict_get_or_null(network_card_set, name);
   return card;
 }
 
@@ -283,8 +297,10 @@ static void update_actions_state(double now, double delta)
   surf_action_network_CM02_t next_action = NULL;
   xbt_swag_t running_actions =
       surf_network_resource->common_public->states.running_action_set;
+  /*
   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;
@@ -385,6 +401,8 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   network_link_CM02_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_CM02_t, 1);
 
   action->generic_action.using = 1;
@@ -432,10 +450,6 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   for (i = 0; i < route_size; i++)
     lmm_expand(maxmin_system, route[i]->constraint, action->variable, 1.0);
 
-  if(route_size == 0) {
-    action_change_state((surf_action_t) action, SURF_ACTION_DONE);
-  }
-
   return (surf_action_t) action;
 }
 
@@ -484,6 +498,7 @@ static void finalize(void)
   free(surf_network_resource);
   surf_network_resource = NULL;
 
+  loopback = NULL;
   for (i = 0; i < card_number; i++) 
     for (j = 0; j < card_number; j++) 
       free(ROUTE(i,j));