X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6aa53dbbb014675e9cd606fb63008c964ee9051d..865f97c868ce92518b1cf4f23e23bd1b16b7917c:/src/surf/network_gtnets_private.h?ds=sidebyside

diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h
index 0a20d4c624..7929eb36a0 100644
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -12,20 +12,24 @@
 #include "xbt/dict.h"
 
 typedef struct network_link_GTNETS {
-  surf_resource_t resource;	/* Any such object, added in a trace
-				   should start by this field!!! */
+  surf_model_t model;           /* Any such object, added in a trace
+                                   should start by this field!!! */
   /* Using this object with the public part of
-     resource does not make sense */
+     model does not make sense */
   char *name;
   double bw_current;
   double lat_current;
   int id;
+  /*holds the properties associated witht the link */
+  xbt_dict_t properties;
 } s_network_link_GTNETS_t, *network_link_GTNETS_t;
 
 
 typedef struct network_card_GTNETS {
   char *name;
   int id;
+  /*holds the properties associated witht the card */
+  xbt_dict_t properties;
 } s_network_card_GTNETS_t, *network_card_GTNETS_t;
 
 typedef struct surf_action_network_GTNETS {
@@ -39,13 +43,7 @@ typedef struct surf_action_network_GTNETS {
   network_card_GTNETS_t dst;
 } s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
 
-extern xbt_dict_t network_card_set;
-
-/* HC: I put this prototype here for now but it will have to go in 
-   src/include/surf.h when it is functionnal. */
-void surf_network_resource_init_GTNETS(const char *filename);
-
-
-#endif				/* _SURF_NETWORK_PRIVATE_H */
+//extern xbt_dict_t network_card_set;
 
 
+#endif /* _SURF_NETWORK_PRIVATE_H */