routing table goes public

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

diff --git a/src/surf/network.c b/src/surf/network.c
index 4dbad48..ebc840f 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -17,12 +17,9 @@ surf_network_resource_t surf_network_resource = NULL;
 static xbt_dict_t network_link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
 static xbt_dict_t network_link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 

-static int card_number = 0;
-static network_link_CM02_t **routing_table = NULL;
-static int *routing_table_size = NULL;
-
-#define ROUTE(i,j) routing_table[(i)+(j)*card_number]
-#define ROUTE_SIZE(i,j) routing_table_size[(i)+(j)*card_number]
+int card_number = 0;
+network_link_CM02_t **routing_table = NULL;
+int *routing_table_size = NULL;

 
 static void create_routing_table(void)
 {
 
 static void create_routing_table(void)
 {

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index a1b52c8..8b4ee26 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -45,4 +45,12 @@ typedef struct surf_action_network_CM02 {
 
 extern xbt_dict_t network_card_set;
 
 
 extern xbt_dict_t network_card_set;
 

+
+extern int card_number;
+extern network_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]
+

 #endif                         /* _SURF_NETWORK_PRIVATE_H */
 #endif                         /* _SURF_NETWORK_PRIVATE_H */