X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..52245cf79e746200dbdc45f37330c1a54852e51b:/src/surf/network_gtnets_private.h diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h index f712870926..0b42195c24 100644 --- a/src/surf/network_gtnets_private.h +++ b/src/surf/network_gtnets_private.h @@ -11,7 +11,7 @@ #include "xbt/dict.h" typedef struct network_link_GTNETS { - s_surf_resource_t generic_resource; /* Must remain first to allow casting */ + s_surf_resource_t generic_resource; /* Must remain first to allow casting */ /* Using this object with the public part of model does not make sense */ double bw_current; @@ -19,11 +19,6 @@ typedef struct network_link_GTNETS { 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; @@ -31,9 +26,14 @@ typedef struct surf_action_network_GTNETS { lmm_variable_t variable; double rate; int suspended; +#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 */