X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/37847073d272353f40d07e8d110b963488362efb..2d6173e9a879e66d8467d65ec80887cf2e5c4e5f:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 277069fc25..5672742cb9 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -14,6 +14,24 @@ #include "portable.h" #include "xbt/config.h" #include "surf/datatypes.h" +#include "xbt/lib.h" + +xbt_lib_t host_lib; +int ROUTING_HOST_LEVEL; //Routing level +int SURF_CPU_LEVEL; //Surf cpu level +int SURF_WKS_LEVEL; //Surf workstation level +int SIMIX_HOST_LEVEL; //Simix level +int MSG_HOST_LEVEL; //Msg level +int SD_HOST_LEVEL; //Simdag level +int COORD_HOST_LEVEL; //Coordinates level + +xbt_lib_t link_lib; +int SD_LINK_LEVEL; //Simdag level +int SURF_LINK_LEVEL; //Surf level + +xbt_lib_t as_router_lib; +int ROUTING_ASR_LEVEL; //Routing level +int COORD_ASR_LEVEL; //Coordinates level SG_BEGIN_DECL() /* Actions and models are highly connected structures... */ @@ -28,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. @@ -144,16 +172,6 @@ XBT_PUBLIC_DATA(routing_global_t) global_routing; */ typedef struct surf_model_private *surf_model_private_t; - /** \brief Timer model extension public - * \ingroup SURF_model - * - * Additionnal functions specific to the timer model - */ -typedef struct surf_timer_model_extension_public { - void (*set) (double date, void *function, void *arg); - int (*get) (void **function, void **arg); -} s_surf_model_extension_timer_t; - /* Cpu model */ /** \brief CPU model extension public @@ -170,6 +188,7 @@ typedef struct surf_cpu_model_extension_public { void (*create_resource) (char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, + int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, xbt_dict_t cpu_properties); @@ -280,19 +299,17 @@ 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_timer_t timer; s_surf_model_extension_cpu_t cpu; s_surf_model_extension_network_t network; s_surf_model_extension_workstation_t workstation; @@ -302,8 +319,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; @@ -335,16 +359,6 @@ typedef struct surf_resource_lmm { /**************************************/ -/** \brief The timer model - * \ingroup SURF_models - */ -XBT_PUBLIC_DATA(surf_model_t) surf_timer_model; - -/** \brief Initializes the timer model - * \ingroup SURF_models - */ -XBT_PUBLIC(void) surf_timer_model_init(const char *filename); - /** \brief The CPU model * \ingroup SURF_models */ @@ -423,6 +437,21 @@ XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename); XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(const char *filename); + +/** \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(const char + *filename); + /** \brief Initializes the platform with the network model 'Constant' * \ingroup SURF_models * \param filename XML platform file name @@ -437,8 +466,6 @@ XBT_PUBLIC(void) surf_network_model_init_LegrandVelho(const char */ XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename); -XBT_PUBLIC(void) surf_network_model_init_Vivaldi(const char *filename); - /** \brief Initializes the platform with the network model CM02 * \ingroup SURF_models * \param filename XML platform file name @@ -607,11 +634,11 @@ XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; * * This function has to be called to initialize the common * structures. Then you will have to create the environment by - * calling surf_timer_model_init() and + * calling * e.g. surf_workstation_model_init_CLM03() or * surf_workstation_model_init_KCCFLN05(). * - * \see surf_timer_model_init(), surf_workstation_model_init_CLM03(), + * \see surf_workstation_model_init_CLM03(), * surf_workstation_model_init_KCCFLN05(), surf_workstation_model_init_compound(), surf_exit() */ XBT_PUBLIC(void) surf_init(int *argc, char **argv); /* initialize common structures */ @@ -640,6 +667,7 @@ XBT_PUBLIC(void) surf_presolve(void); /** \brief Performs a part of the simulation * \ingroup SURF_simulation + * \param max_date Maximum date to update the simulation to, or -1 * \return the elapsed time, or -1.0 if no event could be executed * * This function execute all possible events, update the action states @@ -648,14 +676,14 @@ XBT_PUBLIC(void) surf_presolve(void); * are not executed immediately but only when you call surf_solve. * Note that the returned elapsed time can be zero. */ -XBT_PUBLIC(double) surf_solve(void); +XBT_PUBLIC(double) surf_solve(double max_date); /** \brief Return the current time * \ingroup SURF_simulation * * 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 @@ -668,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); @@ -694,6 +724,7 @@ XBT_PUBLIC(double) get_cpu_power(const char *power); XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, + int core, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace,