X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3141b2111e49b104c2c6b59fe9e61146a688d38..12cdc9f3fef6c84dea9a3eb4602c2183d8bd3a9e:/src/surf/network_private.h diff --git a/src/surf/network_private.h b/src/surf/network_private.h index e6c50cc87f..9b1ee7667a 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -9,11 +9,13 @@ #define _SURF_NETWORK_PRIVATE_H #include "surf_private.h" +#include "network_common.h" #include "xbt/dict.h" typedef struct network_link_CM02 { surf_model_t model; /* Any such object, added in a trace should start by this field!!! */ + xbt_dict_t properties; /* Using this object with the public part of model does not make sense */ char *name; @@ -24,8 +26,6 @@ typedef struct network_link_CM02 { e_surf_link_state_t state_current; tmgr_trace_event_t state_event; lmm_constraint_t constraint; - /*holds the properties associated with a link*/ - xbt_dict_t properties; } s_link_CM02_t, *link_CM02_t; @@ -45,9 +45,6 @@ typedef struct surf_action_network_CM02 { network_card_CM02_t dst; } s_surf_action_network_CM02_t, *surf_action_network_CM02_t; -extern xbt_dict_t network_card_set; - - extern int card_number; extern link_CM02_t **routing_table; extern int *routing_table_size;