X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b7cd17c5d85000c8ea2a145876058fa296fa6d63..f5b15e157009dbaef93d579aaf5f093864fc7cc7:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 78317ba7be..cafb3d3295 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -14,19 +14,22 @@ #include "portable.h" #include "xbt/config.h" #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; + 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); @@ -46,7 +49,7 @@ typedef struct surf_model_description { const char *name; const char *description; surf_model_t model; - void (*model_init_preparse) (const char *filename); + void (*model_init_preparse) (void); void (*model_init_postparse) (void); } s_surf_model_description_t, *surf_model_description_t; @@ -157,7 +160,7 @@ typedef struct surf_cpu_model_extension_public { e_surf_resource_state_t(*get_state) (void *cpu); double (*get_speed) (void *cpu, double load); double (*get_available_speed) (void *cpu); - void (*create_resource) (char *name, double power_peak, + void* (*create_resource) (const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -183,7 +186,7 @@ typedef struct surf_network_model_extension_public { double (*get_link_latency) (const void *link); int (*link_shared) (const void *link); void (*add_traces) (void); - void (*create_resource) (char *name, + void* (*create_resource) (const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -221,7 +224,7 @@ typedef struct surf_workstation_model_extension_public { double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */ int (*link_shared) (const void *link); xbt_dict_t(*get_properties) (const void *resource); - void (*link_create_resource) (char *name, + void* (*link_create_resource) (const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -231,7 +234,7 @@ typedef struct surf_workstation_model_extension_public { tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties); - void (*cpu_create_resource) (char *name, double power_peak, + void* (*cpu_create_resource) (const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, e_surf_resource_state_t state_initial, @@ -271,17 +274,16 @@ typedef struct surf_model { int (*is_suspended) (surf_action_t action); /**< Return whether an action is suspended */ void (*set_max_duration) (surf_action_t action, double duration); /**< Set the max duration of an action*/ void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */ +#ifdef HAVE_TRACING + void (*set_category) (surf_action_t action, const char *category); /**< Set the category of an action */ +#endif double (*get_remains) (surf_action_t action); /**< Get the remains of an action */ #ifdef HAVE_LATENCY_BOUND_TRACKING int (*get_latency_limited) (surf_action_t action); /**< Return 1 if action is limited by latency, 0 otherwise */ #endif - xbt_dict_t resource_set; - - surf_model_private_t model_private; - union extension { s_surf_model_extension_cpu_t cpu; s_surf_model_extension_network_t network; @@ -292,8 +294,15 @@ typedef struct surf_model { surf_model_t surf_model_init(void); void surf_model_exit(surf_model_t model); -void *surf_model_resource_by_name(surf_model_t model, const char *name); -#define surf_model_resource_set(model) (model)->resource_set +static inline void *surf_cpu_resource_by_name(const char *name) { + return xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL); +} +static inline void *surf_workstation_resource_by_name(const char *name){ + return xbt_lib_get_or_null(host_lib, name, SURF_WKS_LEVEL); +} +static inline void *surf_network_resource_by_name(const char *name){ + return xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL); +} typedef struct surf_resource { surf_model_t model; @@ -338,13 +347,13 @@ XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model; * * \see surf_workstation_model_init_CLM03() */ -XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename); +XBT_PUBLIC(void) surf_cpu_model_init_Cas01(void); /** \brief Initializes the CPU model with trace integration * \ingroup SURF_models * */ -XBT_PUBLIC(void) surf_cpu_model_init_ti(const char *filename); +XBT_PUBLIC(void) surf_cpu_model_init_ti(void); /** \brief Initializes the CPU model with the model Cas01 Improved. This model uses a heap to order the events, decreasing the time complexity to get the minimum next event. * \ingroup SURF_models @@ -354,7 +363,7 @@ XBT_PUBLIC(void) surf_cpu_model_init_ti(const char *filename); * * \see surf_workstation_model_init_CLM03() */ -XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(const char *filename); +XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(void); /** \brief The list of all available cpu model models * \ingroup SURF_models @@ -388,7 +397,7 @@ XBT_PUBLIC_DATA(surf_model_t) surf_network_model; * * \see surf_workstation_model_init_SMPI() */ -XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_SMPI(void); /** \brief Initializes the platform with the network model 'LagrangeVelho' * \ingroup SURF_models @@ -400,8 +409,21 @@ XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename); * * \see surf_workstation_model_init_LegrandVelho() */ -XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(const char - *filename); +XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(void); + + +/** \brief Initializes the platform with the network model 'LV08_im' + * \ingroup SURF_models + * \param filename XML platform file name + * + * This model is adds the lazy management improvement to Legrand and + * Velho model. This improvement essentially replaces the list of actions + * inside the simulation kernel by a heap in order to reduce the complexity + * at each iteration of the simulation kernel. + * + * \see surf_workstation_model_init_LegrandVelho() + */ +XBT_PUBLIC(void) im_surf_network_model_init_LegrandVelho(void); /** \brief Initializes the platform with the network model 'Constant' * \ingroup SURF_models @@ -415,9 +437,7 @@ XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(const char * * \see surf_workstation_model_init_compound() */ -XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename); - -XBT_PUBLIC(void) surf_network_model_init_Vivaldi(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_Constant(void); /** \brief Initializes the platform with the network model CM02 * \ingroup SURF_models @@ -428,7 +448,7 @@ XBT_PUBLIC(void) surf_network_model_init_Vivaldi(const char *filename); * * \see surf_workstation_model_init_CLM03() */ -XBT_PUBLIC(void) surf_network_model_init_CM02(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_CM02(void); /** * brief initialize the the network model bypassing the XML parser @@ -447,7 +467,33 @@ XBT_PUBLIC(void) surf_network_model_init_bypass(const char *id, * * \see surf_workstation_model_init_GTNETS() */ -XBT_PUBLIC(void) surf_network_model_init_GTNETS(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_GbTNETS(void); +#endif + +#ifdef HAVE_NS3 +/** \brief Initializes the platform with the network model NS3 + * \ingroup SURF_models + * \param filename XML platform file name + * + * This function is called by surf_workstation_model_init_NS3 + * or by yourself only if you plan using surf_workstation_model_init_compound + * + * \see surf_workstation_model_init_NS3() + */ +XBT_PUBLIC(void) surf_network_model_init_NS3(void); + +XBT_PUBLIC(void) parse_ns3_add_host(void); +XBT_PUBLIC(void) parse_ns3_add_router(void); +XBT_PUBLIC(void) parse_ns3_add_link(void); +XBT_PUBLIC(void) parse_ns3_add_AS(void); +XBT_PUBLIC(void) parse_ns3_add_route(void); +XBT_PUBLIC(void) parse_ns3_add_ASroute(void); +XBT_PUBLIC(void) parse_ns3_add_cluster(void); +XBT_PUBLIC(void) parse_ns3_end_platform(void); +XBT_PUBLIC(void) create_ns3_topology(void); +XBT_PUBLIC(double) ns3_get_link_latency(const void *link); +XBT_PUBLIC(double) ns3_get_link_bandwidth(const void *link); + #endif /** \brief Initializes the platform with the network model Reno @@ -463,7 +509,7 @@ XBT_PUBLIC(void) surf_network_model_init_GTNETS(const char *filename); * Call this function only if you plan using surf_workstation_model_init_compound. * */ -XBT_PUBLIC(void) surf_network_model_init_Reno(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_Reno(void); /** \brief Initializes the platform with the network model Reno2 * \ingroup SURF_models @@ -478,7 +524,7 @@ XBT_PUBLIC(void) surf_network_model_init_Reno(const char *filename); * Call this function only if you plan using surf_workstation_model_init_compound. * */ -XBT_PUBLIC(void) surf_network_model_init_Reno2(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_Reno2(void); /** \brief Initializes the platform with the network model Vegas * \ingroup SURF_models @@ -494,7 +540,7 @@ XBT_PUBLIC(void) surf_network_model_init_Reno2(const char *filename); * Call this function only if you plan using surf_workstation_model_init_compound. * */ -XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename); +XBT_PUBLIC(void) surf_network_model_init_Vegas(void); /** \brief The list of all available network model models * \ingroup SURF_models @@ -521,8 +567,7 @@ XBT_PUBLIC_DATA(surf_model_t) surf_workstation_model; * network_model have been set up. * */ -XBT_PUBLIC(void) surf_workstation_model_init_compound(const char - *filename); +XBT_PUBLIC(void) surf_workstation_model_init_compound(void); /** \brief Initializes the platform with the workstation model CLM03 * \ingroup SURF_models @@ -536,7 +581,7 @@ XBT_PUBLIC(void) surf_workstation_model_init_compound(const char * * \see surf_workstation_model_init_KCCFLN05() */ -XBT_PUBLIC(void) surf_workstation_model_init_CLM03(const char *filename); +XBT_PUBLIC(void) surf_workstation_model_init_CLM03(void); /** \brief Initializes the platform with the model KCCFLN05 * \ingroup SURF_models @@ -549,8 +594,7 @@ XBT_PUBLIC(void) surf_workstation_model_init_CLM03(const char *filename); * SimDag. * */ -XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char - *filename); +XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(void); /** \brief Initializes the platform with the model KCCFLN05 * \ingroup SURF_models @@ -561,8 +605,7 @@ XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char * the model to each action. * */ -XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char - *filename); +XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(void); /** \brief The list of all available workstation model models * \ingroup SURF_models @@ -596,15 +639,6 @@ XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; */ XBT_PUBLIC(void) surf_init(int *argc, char **argv); /* initialize common structures */ -/** \brief Initialize the used models. - * - * Must be called after the surf_init so that configuration infrastructure is created - * Must be called before parsing/creating the environment - * Must not be called within the initialization process so that the use get a chance to change the settings from - * its code between, say, MSG_init and MSG_create_environment using MSG_config - */ -XBT_PUBLIC(void) surf_config_models_setup(const char *platform_file); - /** \brief create the elements of the models * * Must be called after parsing the platform file and before using any elements @@ -636,7 +670,7 @@ XBT_PUBLIC(double) surf_solve(double max_date); * * Return the current time in millisecond. */ -XBT_PUBLIC(double) surf_get_clock(void); +XBT_INLINE XBT_PUBLIC(double) surf_get_clock(void); /** \brief Exit SURF * \ingroup SURF_simulation @@ -649,7 +683,8 @@ 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); /* surf parse file related (public because called from a test suite) */ XBT_PUBLIC(void) parse_platform_file(const char *file); @@ -672,7 +707,7 @@ XBT_PUBLIC(double) get_cpu_power(const char *power); * * see surfxml_parse.c * */ -XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak, +XBT_PUBLIC(void*) surf_host_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -685,7 +720,7 @@ XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak, * * see surfxml_parse.c * */ -XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name, +XBT_PUBLIC(void*) surf_wsL07_host_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, @@ -698,7 +733,7 @@ XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name, * create link resource * see surfxml_parse.c */ -XBT_PUBLIC(void) surf_link_create_resource(char *name, +XBT_PUBLIC(void*) surf_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -710,7 +745,7 @@ XBT_PUBLIC(void) surf_link_create_resource(char *name, policy, xbt_dict_t properties); -XBT_PUBLIC(void) surf_wsL07_link_create_resource(char *name, +XBT_PUBLIC(void*) surf_wsL07_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -746,28 +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); -/* - * init AS from lua console - * see surf_routing.c - */ -XBT_PUBLIC(void) routing_AS_init(const char *id, const char *mode); -XBT_PUBLIC(void) routing_AS_end(const char *id); -// 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_AS_new(const char *id, const char *mode); -XBT_PUBLIC(void) surf_AS_finalize(const char *id); -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);