X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/775902179ef85ee0dd9a2afdcd5750e1146ec0b2..347996b4a10c4e8579080692afa60e0afb88b60a:/src/surf/surf_private.h diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 43d0e585b4..2cf7e4c860 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -12,10 +12,10 @@ #include "surf/surf.h" #include "surf/maxmin.h" #include "xbt/log.h" -#include "surf/surfxml_parse.h" #include "src/surf/trace_mgr.hpp" #include "src/instr/instr_private.h" #include "surf/surfxml_parse_values.h" +#include "src/surf/xml/platf_private.hpp" #define NO_MAX_DURATION -1.0 @@ -51,20 +51,12 @@ XBT_PRIVATE int __surf_is_absolute_file_path(const char *file_path); * Routing logic */ -typedef struct s_model_type { - const char *name; - const char *desc; - AS_t (*create) (); - void (*end) (AS_t as); -} s_routing_model_description_t, *routing_model_description_t; - /* This enum used in the routing structure helps knowing in which situation we are. */ typedef enum { SURF_ROUTING_NULL = 0, /**< Undefined type */ SURF_ROUTING_BASE, /**< Base case: use simple link lists for routing */ SURF_ROUTING_RECURSIVE /**< Recursive case: also return gateway informations */ } e_surf_routing_hierarchy_t; - extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set;