X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5bcfbaff5a82e40d9a5d1861f073fc0befbd7f1b..f5b15e157009dbaef93d579aaf5f093864fc7cc7:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index cde8899573..cafb3d3295 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -16,19 +16,10 @@ #include "surf/datatypes.h" #include "xbt/lib.h" #include "surf/surf_routing.h" +#include "simgrid/platf_interface.h" SG_BEGIN_DECL() /* Actions and models are highly connected structures... */ -typedef enum { - SURF_RESOURCE_ON = 1, /**< Up & ready */ - SURF_RESOURCE_OFF = 0 /**< Down & broken */ -} e_surf_resource_state_t; - -typedef enum { - SURF_LINK_FULLDUPLEX = 2, - SURF_LINK_SHARED = 1, - SURF_LINK_FATPIPE = 0 -} e_surf_link_sharing_policy_t; typedef enum { SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ @@ -790,23 +781,12 @@ XBT_PUBLIC(void) surf_add_host_traces(void); XBT_PUBLIC(void) surf_add_link_traces(void); XBT_PUBLIC(void) surf_wsL07_add_traces(void); -/* - * lua console - */ -// add host to network element list -XBT_PUBLIC(void) routing_add_host(const char *host_id); //Set a new link on the actual list of link for a route or ASroute XBT_PUBLIC(void) routing_add_link(const char *link_id); //Set the endpoints for a route XBT_PUBLIC(void) routing_set_route(const char *src_id, const char *dst_id); //Store the route XBT_PUBLIC(void) routing_store_route(void); - -/* - * interface between surf and lua bindings - * see surfxml_parse.c - */ -XBT_PUBLIC(void) surf_route_add_host(const char *id); XBT_PUBLIC(void) surf_routing_add_route(const char *src_id, const char *dest_id, xbt_dynar_t links_id);