X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/611fa4440524f3f3d6006c0792756ff2ed2a4197..867ae3ddfab33175d0bce6d797b2f537396693aa:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 9e906a3039..04530c6fdd 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -11,6 +11,7 @@ #include "xbt/dynar.h" #include "xbt/dict.h" #include "xbt/misc.h" +#include "xbt/file_stat.h" #include "portable.h" #include "xbt/config.h" #include "surf/datatypes.h" @@ -21,15 +22,21 @@ SG_BEGIN_DECL() /* Actions and models are highly connected structures... */ +typedef enum { + UM_FULL, + UM_LAZY, + UM_UNDEFINED +} e_UM_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 */ + 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); +XBT_PUBLIC(e_surf_network_element_type_t) + routing_get_network_element_type(const char* name); /** @Brief Specify that we use that action */ XBT_PUBLIC(void) surf_action_ref(surf_action_t action); @@ -56,8 +63,15 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table, XBT_PUBLIC(void) model_help(const char *category, s_surf_model_description_t * table); -/** \brief Action structure - * \ingroup SURF_actions +enum heap_action_type{ + LATENCY = 100, + MAX_DURATION, + NORMAL, + NOTSET +}; + +/** \ingroup SURF_actions + * \brief Action structure * * Never create s_surf_action_t by yourself ! The actions are created * on the fly when you call execute or communicate on a model. @@ -86,16 +100,23 @@ typedef struct surf_action { #ifdef HAVE_TRACING char *category; /**< tracing category for categorized resource utilization monitoring */ #endif + surf_file_t file; /**< surf_file_t for storage model */ + s_file_stat_t stat; /**< surf_file_t for storage model */ } s_surf_action_t; typedef struct surf_action_lmm { s_surf_action_t generic_action; lmm_variable_t variable; int suspended; + s_xbt_swag_hookup_t action_list_hookup; + int index_heap; + double last_update; + double last_value; + enum heap_action_type hat; } s_surf_action_lmm_t, *surf_action_lmm_t; -/** \brief Action states - * \ingroup SURF_actions +/** \ingroup SURF_actions + * \brief Action states * * Action states. * @@ -111,8 +132,8 @@ typedef enum { /**< Not in the system anymore. Why did you ask ? */ } e_surf_action_state_t; -/** \brief Action state sets - * \ingroup SURF_actions +/** \ingroup SURF_actions + * \brief Action state sets * * This structure contains some sets of actions. * It provides a fast access to the actions in each state. @@ -133,19 +154,19 @@ typedef struct surf_action_state { /***************************/ /* Generic model object */ /***************************/ -typedef struct s_routing_global s_routing_global_t, *routing_global_t; -XBT_PUBLIC_DATA(routing_global_t) global_routing; +typedef struct s_routing_platf s_routing_platf_t, *routing_platf_t; +XBT_PUBLIC_DATA(routing_platf_t) routing_platf; -/** \brief Private data available on all models - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Private data available on all models */ typedef struct surf_model_private *surf_model_private_t; /* Cpu model */ - /** \brief CPU model extension public - * \ingroup SURF_models + /** \ingroup SURF_models + * \brief CPU model extension public * * Public functions specific to the CPU model. */ @@ -167,16 +188,16 @@ typedef struct surf_cpu_model_extension_public { /* Network model */ - /** \brief Network model extension public - * \ingroup SURF_models + /** \ingroup SURF_models + * \brief Network model extension public * * Public functions specific to the network model */ typedef struct surf_network_model_extension_public { - surf_action_t(*communicate) (const char *src_name, - const char *dst_name, - double size, double rate); - xbt_dynar_t(*get_route) (const char *src_name, const char *dst_name); + surf_action_t (*communicate) (sg_routing_edge_t src, + sg_routing_edge_t dst, + double size, double rate); + xbt_dynar_t(*get_route) (void *src, void *dst); //FIXME: kill field? That is done by the routing nowadays double (*get_link_bandwidth) (const void *link); double (*get_link_latency) (const void *link); int (*link_shared) (const void *link); @@ -193,8 +214,25 @@ typedef struct surf_network_model_extension_public { xbt_dict_t properties); } s_surf_model_extension_network_t; - /** \brief Workstation model extension public - * \ingroup SURF_models +/* Storage model */ + +/** \ingroup SURF_models + * \brief Storage model extension public + * + * Public functions specific to the Storage model. + */ + +typedef struct surf_storage_model_extension_public { + surf_action_t(*open) (void *storage, const char* path, const char* mode); + surf_action_t(*close) (void *storage, surf_file_t fp); + surf_action_t(*read) (void *storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream); + surf_action_t(*write) (void *storage, const void* ptr, size_t size, size_t nmemb, surf_file_t stream); + surf_action_t(*stat) (void *storage, surf_file_t stream); + void* (*create_resource) (const char* id, const char* model,const char* type_id); +} s_surf_model_extension_storage_t; + + /** \ingroup SURF_models + * \brief Workstation model extension public * * Public functions specific to the workstation model. */ @@ -208,6 +246,7 @@ typedef struct surf_workstation_model_extension_public { surf_action_t(*communicate) (void *workstation_src, /**< Execute a communication amount between two workstations */ void *workstation_dst, double size, double max_rate); + // FIXME: kill next field, which duplicates the routing xbt_dynar_t(*get_route) (void *workstation_src, void *workstation_dst); /**< Get the list of links between two ws */ surf_action_t(*execute_parallel_task) (int workstation_nb, /**< Execute a parallel task on several workstations */ @@ -217,6 +256,11 @@ typedef struct surf_workstation_model_extension_public { double amount, double rate); double (*get_link_bandwidth) (const void *link); /**< Return the current bandwidth of a network link */ double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */ + surf_action_t(*open) (void *workstation, const char* storage, const char* path, const char* mode); + surf_action_t(*close) (void *workstation, const char* storage, surf_file_t fp); + surf_action_t(*read) (void *workstation, const char* storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream); + surf_action_t(*write) (void *workstation, const char* storage, const void* ptr, size_t size, size_t nmemb, surf_file_t stream); + surf_action_t(*stat) (void *workstation, const char* storage, surf_file_t stream); int (*link_shared) (const void *link); xbt_dict_t(*get_properties) (const void *resource); void* (*link_create_resource) (const char *name, @@ -242,8 +286,8 @@ typedef struct surf_workstation_model_extension_public { -/** \brief Model datatype - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Model datatype * * Generic data structure for a model. The workstations, * the CPUs and the network links are examples of models. @@ -279,9 +323,17 @@ typedef struct surf_model { surf_model_private_t model_private; + // for action + lmm_system_t maxmin_system; + e_UM_t update_mechanism; + xbt_swag_t modified_set; + xbt_heap_t action_heap; + int selective_update; + union extension { s_surf_model_extension_cpu_t cpu; s_surf_model_extension_network_t network; + s_surf_model_extension_storage_t storage; s_surf_model_extension_workstation_t workstation; } extension; } s_surf_model_t; @@ -295,8 +347,8 @@ static inline void *surf_cpu_resource_by_name(const char *name) { 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); +static inline void *surf_storage_resource_by_name(const char *name){ + return xbt_lib_get_or_null(storage_lib, name, SURF_STORAGE_LEVEL); } typedef struct surf_resource { @@ -305,8 +357,6 @@ typedef struct surf_resource { xbt_dict_t properties; } s_surf_resource_t, *surf_resource_t; - - /** * Resource which have a metric handled by a maxmin system */ @@ -329,13 +379,18 @@ typedef struct surf_resource_lmm { /**************************************/ -/** \brief The CPU model - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief The CPU model */ XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model; -/** \brief Initializes the CPU model with the model Cas01 - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the CPU model with the model Cas01 + * + * By default, this model uses the lazy optimization mechanism that + * relies on partial invalidation in LMM and a heap for lazy action update. + * You can change this behavior by setting the cpu/optim configuration + * variable to a different value. * * This function is called by surf_workstation_model_init_CLM03 * so you shouldn't have to call it by yourself. @@ -344,24 +399,32 @@ XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model; */ XBT_PUBLIC(void) surf_cpu_model_init_Cas01(void); -/** \brief Initializes the CPU model with trace integration - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the CPU model with trace integration [Deprecated] * + * You shouldn't have to call it by yourself. + * \see surf_workstation_model_init_CLM03() */ 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 +/** \brief This function call the share resources function needed * - * This function is called by surf_workstation_model_init_CLM03 - * so you shouldn't have to call it by yourself. + */ +XBT_PUBLIC(double) generic_share_resources(double now); + +/** \brief This function call the update action state function needed * - * \see surf_workstation_model_init_CLM03() */ -XBT_PUBLIC(void) surf_cpu_model_init_Cas01_im(void); +XBT_PUBLIC(void) generic_update_actions_state(double now, double delta); + +/** \ingroup SURF_models + * \brief The list of all available optimization modes (both for cpu and networks). + * These optimization modes can be set using --cfg=cpu/optim:... and --cfg=network/optim:... + */ +XBT_PUBLIC_DATA(s_surf_model_description_t) surf_optimization_mode_description[]; -/** \brief The list of all available cpu model models - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief The list of all available cpu model models */ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[]; @@ -372,8 +435,8 @@ XBT_PUBLIC(void) create_workstations(void); */ -/** \brief The network model - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief The network model * * When creating a new API on top on SURF, you shouldn't use the * network model unless you know what you are doing. Only the workstation @@ -382,47 +445,31 @@ XBT_PUBLIC(void) create_workstations(void); */ XBT_PUBLIC_DATA(surf_model_t) surf_network_model; -/** \brief Same as network model 'LagrangeVelho', only with different correction factors. - * \ingroup SURF_models - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Same as network model 'LagrangeVelho', only with different correction factors. * * This model is proposed by Pierre-Nicolas Clauss and Martin Quinson and Stéphane Génaud * based on the model 'LV08' and different correction factors depending on the communication * size (< 1KiB, < 64KiB, >= 64KiB). + * See comments in the code for more information. * * \see surf_workstation_model_init_SMPI() */ XBT_PUBLIC(void) surf_network_model_init_SMPI(void); -/** \brief Initializes the platform with the network model 'LagrangeVelho' - * \ingroup SURF_models - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Initializes the platform with the network model 'LegrandVelho' * * This model is proposed by Arnaud Legrand and Pedro Velho based on * the results obtained with the GTNets simulator for onelink and - * dogbone sharing scenarios. + * dogbone sharing scenarios. See comments in the code for more information. * * \see surf_workstation_model_init_LegrandVelho() */ 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 - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Initializes the platform with the network model 'Constant' * * In this model, the communication time between two network cards is * constant, hence no need for a routing table. This is particularly @@ -434,12 +481,12 @@ XBT_PUBLIC(void) im_surf_network_model_init_LegrandVelho(void); */ XBT_PUBLIC(void) surf_network_model_init_Constant(void); -/** \brief Initializes the platform with the network model CM02 - * \ingroup SURF_models - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Initializes the platform with the network model CM02 * * This function is called by surf_workstation_model_init_CLM03 * or by yourself only if you plan using surf_workstation_model_init_compound + * See comments in the code for more information. * * \see surf_workstation_model_init_CLM03() */ @@ -453,8 +500,8 @@ XBT_PUBLIC(void) surf_network_model_init_bypass(const char *id, double initial_lat); #ifdef HAVE_GTNETS -/** \brief Initializes the platform with the network model GTNETS - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the platform with the network model GTNETS * \param filename XML platform file name * * This function is called by surf_workstation_model_init_GTNETS @@ -462,12 +509,12 @@ XBT_PUBLIC(void) surf_network_model_init_bypass(const char *id, * * \see surf_workstation_model_init_GTNETS() */ -XBT_PUBLIC(void) surf_network_model_init_GbTNETS(void); +XBT_PUBLIC(void) surf_network_model_init_GTNETS(void); #endif #ifdef HAVE_NS3 -/** \brief Initializes the platform with the network model NS3 - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the platform with the network model NS3 * \param filename XML platform file name * * This function is called by surf_workstation_model_init_NS3 @@ -476,23 +523,10 @@ XBT_PUBLIC(void) surf_network_model_init_GbTNETS(void); * \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 - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the platform with the network model Reno * \param filename XML platform file name * * The problem is related to max( sum( arctan(C * Df * xi) ) ). @@ -506,8 +540,8 @@ XBT_PUBLIC(double) ns3_get_link_bandwidth(const void *link); */ XBT_PUBLIC(void) surf_network_model_init_Reno(void); -/** \brief Initializes the platform with the network model Reno2 - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the platform with the network model Reno2 * \param filename XML platform file name * * The problem is related to max( sum( arctan(C * Df * xi) ) ). @@ -521,8 +555,8 @@ XBT_PUBLIC(void) surf_network_model_init_Reno(void); */ XBT_PUBLIC(void) surf_network_model_init_Reno2(void); -/** \brief Initializes the platform with the network model Vegas - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief Initializes the platform with the network model Vegas * \param filename XML platform file name * * This problem is related to max( sum( a * Df * ln(xi) ) ) which is equivalent @@ -537,15 +571,36 @@ XBT_PUBLIC(void) surf_network_model_init_Reno2(void); */ XBT_PUBLIC(void) surf_network_model_init_Vegas(void); -/** \brief The list of all available network model models - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief The list of all available network model models */ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[]; -/** \brief The workstation model - * \ingroup SURF_models + + + + +/** \ingroup SURF_models + * \brief The storage model + */ +XBT_PUBLIC(void) surf_storage_model_init_default(void); + +/** \ingroup SURF_models + * \brief The list of all available storage modes. + * This storage mode can be set using --cfg=storage/model:... + */ +XBT_PUBLIC_DATA(s_surf_model_description_t) surf_storage_model_description[]; + + + + + + + +/** \ingroup SURF_models + * \brief The workstation model * * Note that when you create an API on top of SURF, * the workstation model should be the only one you use @@ -554,9 +609,8 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) */ XBT_PUBLIC_DATA(surf_model_t) surf_workstation_model; -/** \brief Initializes the platform with a compound workstation model - * \ingroup SURF_models - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Initializes the platform with a compound workstation model * * This function should be called after a cpu_model and a * network_model have been set up. @@ -564,9 +618,20 @@ XBT_PUBLIC_DATA(surf_model_t) surf_workstation_model; */ XBT_PUBLIC(void) surf_workstation_model_init_compound(void); -/** \brief Initializes the platform with the workstation model CLM03 - * \ingroup SURF_models - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Initializes the platform with the current best network and cpu models at hand + * + * This platform model seperates the workstation model and the network model. + * The workstation model will be initialized with the model compound, the network + * model with the model LV08 (with cross traffic support) and the CPU model with + * the model Cas01. + * Such model is subject to modification with warning in the ChangeLog so monitor it! + * + */ +XBT_PUBLIC(void) surf_workstation_model_init_current_default(void); + +/** \ingroup SURF_models + * \brief Initializes the platform with the workstation model CLM03 * * This platform model seperates the workstation model and the network model. * The workstation model will be initialized with the model CLM03, the network @@ -574,26 +639,11 @@ XBT_PUBLIC(void) surf_workstation_model_init_compound(void); * In future releases, some other network models will be implemented and will be * combined with the workstation model CLM03. * - * \see surf_workstation_model_init_KCCFLN05() */ XBT_PUBLIC(void) surf_workstation_model_init_CLM03(void); -/** \brief Initializes the platform with the model KCCFLN05 - * \ingroup SURF_models - * \param filename XML platform file name - * - * With this model, the workstations and the network are handled - * together. The network model is roughly the same as in CM02 but - * interference between computations and communications can be taken - * into account. This platform model is the default one for MSG and - * SimDag. - * - */ -XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(void); - -/** \brief Initializes the platform with the model KCCFLN05 - * \ingroup SURF_models - * \param filename XML platform file name +/** \ingroup SURF_models + * \brief Initializes the platform with the model KCCFLN05 * * With this model, only parallel tasks can be used. Resource sharing * is done by identifying bottlenecks and giving an equal share of @@ -602,14 +652,14 @@ XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(void); */ XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(void); -/** \brief The list of all available workstation model models - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief The list of all available workstation model models */ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[]; -/** \brief List of initialized models - * \ingroup SURF_models +/** \ingroup SURF_models + * \brief List of initialized models */ XBT_PUBLIC_DATA(xbt_dynar_t) model_list; @@ -618,31 +668,29 @@ XBT_PUBLIC_DATA(xbt_dynar_t) model_list; /*******************************************/ XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; -/** \brief Initialize SURF - * \ingroup SURF_simulation +/** \ingroup SURF_simulation + * \brief Initialize SURF * \param argc argument number * \param argv arguments * * This function has to be called to initialize the common * structures. Then you will have to create the environment by * calling - * e.g. surf_workstation_model_init_CLM03() or - * surf_workstation_model_init_KCCFLN05(). + * e.g. surf_workstation_model_init_CLM03() * - * \see surf_workstation_model_init_CLM03(), - * surf_workstation_model_init_KCCFLN05(), surf_workstation_model_init_compound(), surf_exit() + * \see surf_workstation_model_init_CLM03(), surf_workstation_model_init_compound(), surf_exit() */ XBT_PUBLIC(void) surf_init(int *argc, char **argv); /* initialize common structures */ -/** \brief Finish simulation initialization - * \ingroup SURF_simulation +/** \ingroup SURF_simulation + * \brief Finish simulation initialization * * This function must be called before the first call to surf_solve() */ XBT_PUBLIC(void) surf_presolve(void); -/** \brief Performs a part of the simulation - * \ingroup SURF_simulation +/** \ingroup SURF_simulation + * \brief Performs a part of the 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 * @@ -654,15 +702,15 @@ XBT_PUBLIC(void) surf_presolve(void); */ XBT_PUBLIC(double) surf_solve(double max_date); -/** \brief Return the current time - * \ingroup SURF_simulation +/** \ingroup SURF_simulation + * \brief Return the current time * * Return the current time in millisecond. */ -XBT_INLINE XBT_PUBLIC(double) surf_get_clock(void); +XBT_PUBLIC(double) surf_get_clock(void); -/** \brief Exit SURF - * \ingroup SURF_simulation +/** \ingroup SURF_simulation + * \brief Exit SURF * * Clean everything. * @@ -672,8 +720,7 @@ 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(const char* prop_id, const char* prop_value); -XBT_PUBLIC_DATA(void) parse_properties_XML(void); +XBT_PUBLIC(void) parse_properties(void); /* surf parse file related (public because called from a test suite) */ XBT_PUBLIC(void) parse_platform_file(const char *file); @@ -692,5 +739,8 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency; XBT_PUBLIC(double) get_cpu_power(const char *power); +int surf_get_nthreads(void); +void surf_set_nthreads(int nthreads); + SG_END_DECL() #endif /* _SURF_SURF_H */