X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/436361a4e22fc3964761df7db5948b009060cfb8..2d6173e9a879e66d8467d65ec80887cf2e5c4e5f:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 2eac72d9ce..5672742cb9 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -46,6 +46,16 @@ typedef enum { SURF_LINK_FATPIPE = 0 } e_surf_link_sharing_policy_t; +typedef enum { + SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ + SURF_NETWORK_ELEMENT_HOST, /* host type */ + SURF_NETWORK_ELEMENT_ROUTER, /* router type */ + SURF_NETWORK_ELEMENT_AS, /* AS type */ +} e_surf_network_element_type_t; + +XBT_PUBLIC(e_surf_network_element_type_t) get_network_element_type(const char + *name); + /** @Brief Specify that we use that action */ XBT_PUBLIC(void) surf_action_ref(surf_action_t action); /** @brief Creates a new action. @@ -686,7 +696,9 @@ XBT_PUBLIC(void) surf_exit(void); /* Prototypes of the functions that handle the properties */ XBT_PUBLIC_DATA(xbt_dict_t) current_property_set; /* the prop set for the currently parsed element (also used in SIMIX) */ -XBT_PUBLIC_DATA(void) parse_properties(void); +XBT_PUBLIC_DATA(void) parse_properties(const char* prop_id, const char* prop_value); +XBT_PUBLIC_DATA(void) parse_properties_XML(void); +XBT_PUBLIC_DATA(void) parse_properties_lua(const char* prop_id, const char* prop_value); /* surf parse file related (public because called from a test suite) */ XBT_PUBLIC(void) parse_platform_file(const char *file);