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

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

diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index c0f80ee..b307415 100644 (file)
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -78,9 +78,7 @@ static void network_card_free(void *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,7 +97,7 @@ 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]));
+    link_list[i] = xbt_dict_get_or_null(network_link_set, links[i]);
     free(links[i]);
   }
   free(links);
@@ -123,7 +121,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;
   if (A_network_link_state==A_network_link_state_OFF) 
@@ -189,11 +187,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)
@@ -267,8 +261,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;
@@ -369,6 +365,8 @@ 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;