gtnets tracing possible again, updated to latest routing

[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 fa6bdce..0b42195 100644 (file)
--- a/src/surf/network_gtnets_private.h
+++ b/src/surf/network_gtnets_private.h
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -12,22 +11,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;
-} s_network_card_GTNETS_t, *network_card_GTNETS_t;
-
 typedef struct surf_action_network_GTNETS {
   s_surf_action_t generic_action;
   double latency;
@@ -35,13 +26,14 @@ typedef struct surf_action_network_GTNETS {
   lmm_variable_t variable;
   double rate;
   int suspended;
-  network_card_GTNETS_t src;
-  network_card_GTNETS_t dst;
+#ifdef HAVE_TRACING
+  char *src_name;
+  char *dst_name;
+#endif //HAVE_TRACING
 } s_surf_action_network_GTNETS_t, *surf_action_network_GTNETS_t;
 
-extern xbt_dict_t network_card_set;
-
+xbt_dict_t network_card_ids;
 
-#endif                         /* _SURF_NETWORK_PRIVATE_H */
 
 
+#endif                          /* _SURF_NETWORK_PRIVATE_H */