Corrected small bug in network model host_number is used instead of card_number.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5555 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index 7c81c2f..50de0dd 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -98,7 +98,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;
@@ -695,14 +695,14 @@ 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;
 }
 
 static void surf_network_model_init_internal(void)

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index 9b1ee76..2d84d82 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -49,7 +49,7 @@ extern int card_number;
 extern link_CM02_t **routing_table;
 extern int *routing_table_size;
 
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
+#define ROUTE(i,j) routing_table[(i)+(j)*host_number]
+#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*host_number]
 
 #endif                         /* _SURF_NETWORK_PRIVATE_H */