X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7f7d40b071a8c28f2582c39bf599e32802580eb..186fc80124c48924463bcbc8cd3f64a49b5e3c07:/src/surf/network_private.h diff --git a/src/surf/network_private.h b/src/surf/network_private.h index eeac6d0a4e..d57d9cecff 100644 --- a/src/surf/network_private.h +++ b/src/surf/network_private.h @@ -9,22 +9,15 @@ #define _SURF_NETWORK_PRIVATE_H #include "surf_private.h" -#include "network_common.h" #include "xbt/dict.h" typedef struct network_link_CM02 { - s_surf_resource_t generic_resource; /* must remain first to be added to a trace */ + s_surf_resource_lmm_t lmm_resource; /* must remain first to be added to a trace */ - xbt_dict_t properties; /* Using this object with the public part of model does not make sense */ - double bw_current; - tmgr_trace_event_t bw_event; double lat_current; tmgr_trace_event_t lat_event; - e_surf_link_state_t state_current; - tmgr_trace_event_t state_event; - lmm_constraint_t constraint; } s_link_CM02_t, *link_CM02_t; @@ -36,10 +29,6 @@ typedef struct surf_action_network_CM02 { lmm_variable_t variable; double rate; int suspended; -#ifdef KILLME - int src; - int dst; -#endif } s_surf_action_network_CM02_t, *surf_action_network_CM02_t; #endif /* _SURF_NETWORK_PRIVATE_H */