X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/368be7990cfe509e3c7715d9ad28f5ca1b3d62ef..186fc80124c48924463bcbc8cd3f64a49b5e3c07:/src/surf/network_gtnets_private.h diff --git a/src/surf/network_gtnets_private.h b/src/surf/network_gtnets_private.h index 7929eb36a0..2a6534c5da 100644 --- a/src/surf/network_gtnets_private.h +++ b/src/surf/network_gtnets_private.h @@ -12,24 +12,17 @@ #include "xbt/dict.h" typedef struct network_link_GTNETS { - surf_model_t model; /* 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 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,8 +32,6 @@ 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;