Allow to set latency_factor, bandwidth_factor and weight_S parameters of the network...

[simgrid.git] / src / surf / network_gtnets_private.h

diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h
index 0a20d4c..2a6534c 100644 (file)
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -12,17 +12,14 @@
 #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!!! */
+  s_surf_resource_t generic_resource; /* Must remain first to allow casting */
   /* Using this object with the public part of
-     resource does not make sense */
-  char *name;
+     model does not make sense */
   double bw_current;
   double lat_current;
   int id;
 } s_network_link_GTNETS_t, *network_link_GTNETS_t;
 
-
 typedef struct network_card_GTNETS {
   char *name;
   int id;
@@ -35,17 +32,9 @@ typedef struct surf_action_network_GTNETS {
   lmm_variable_t variable;
   double rate;
   int suspended;
-  network_card_GTNETS_t src;
-  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 */