X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/073f8bce5afb1febdc3580607be8819b90705280..d7fe15f62820f53f48d0f894212373fac36e449b:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 1715b65a8c..8b83c0adac 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -12,7 +12,6 @@ #include "xbt/dynar.h" #include "xbt/dict.h" #include "xbt/misc.h" -#include "gras_config.h" SG_BEGIN_DECL() @@ -44,6 +43,7 @@ typedef struct surf_model_description { const char *name; surf_model_t model; void (* model_init) (const char *filename); + void (* create_ws) (void); } s_surf_model_description_t, *surf_model_description_t; XBT_PUBLIC(void) update_model_description(s_surf_model_description_t *table, @@ -123,7 +123,7 @@ typedef struct surf_action_state { typedef struct surf_model_public { s_surf_action_state_t states; /**< Any living action on this model */ void *(*name_service) (const char *name); /**< Return a model given its name */ - const char *(*get_model_name) (void *model_id); /**< Return the name of a model */ + const char *(*get_resource_name) (void *resource_id); /**< Return the name of a resource */ e_surf_action_state_t(*action_get_state) (surf_action_t action); /**< Return the state of an action */ double (*action_get_start_time) (surf_action_t action); /**< Return the start time of an action */ @@ -141,6 +141,9 @@ typedef struct surf_model_public { 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 */ const char *name; /**< Name of this model */ + + xbt_dict_t (*get_properties) (void* link); /**< Return the properties dictionary */ + } s_surf_model_public_t, *surf_model_public_t; /** \brief Private data available on all models @@ -199,8 +202,8 @@ XBT_PUBLIC(void) surf_timer_model_init(const char *filename); * \ingroup SURF_models */ typedef enum { - SURF_CPU_ON = 1, /**< Ready */ - SURF_CPU_OFF = 0 /**< Running */ + SURF_CPU_ON = 1, /**< Up & ready */ + SURF_CPU_OFF = 0 /**< Down & broken */ } e_surf_cpu_state_t; /** \brief CPU model extension public @@ -241,11 +244,11 @@ XBT_PUBLIC_DATA(surf_cpu_model_t) surf_cpu_model; */ XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename); -extern XBT_PUBLIC_DATA(int) surf_cpu_model_description_size; +#define surf_cpu_model_description_size 1 /** \brief The list of all available cpu model models * \ingroup SURF_models */ -extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[]; +XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[surf_cpu_model_description_size]; /* Network model */ @@ -274,6 +277,8 @@ typedef struct surf_network_model { surf_network_model_extension_public_t extension_public; } s_surf_network_model_t, *surf_network_model_t; +XBT_PUBLIC(void) create_workstations(void); + /** \brief The network model * \ingroup SURF_models * @@ -284,6 +289,21 @@ typedef struct surf_network_model { */ XBT_PUBLIC_DATA(surf_network_model_t) surf_network_model; + +/** \brief Initializes the platform with the network model 'Constant' + * \ingroup SURF_models + * \param filename XML platform file name + * + * In this model, the communication time between two network cards is + * constant, hence no need for a routing table. This is particularly + * usefull when simulating huge distributed algorithms where + * scalability is really an issue. This function is called in + * conjunction with surf_workstation_model_init_compound. + * + * \see surf_workstation_model_init_compound() + */ +XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename); + /** \brief Initializes the platform with the network model CM02 * \ingroup SURF_models * \param filename XML platform file name @@ -349,7 +369,7 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename); * * Reference: * - * [TAG03]. Corinne Touati, Eitan Altman, and Jérôme Galtier. + * [TAG03]. Corinne Touati, Eitan Altman, and Jerome Galtier. * Semi-definite programming approach for bandwidth allocation and routing in networks. * Game Theory and Applications, 9:169-179, December 2003. Nova publisher. * @@ -358,13 +378,17 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename); XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename); #endif - - -extern XBT_PUBLIC_DATA(int) surf_network_model_description_size; +#if defined(HAVE_GTNETS) && defined(HAVE_SDP) +# define surf_network_model_description_size 6 +#elsif defined(HAVE_GTNETS) || defined(HAVE_SDP) +# define surf_network_model_description_size 5 +#else +# define surf_network_model_description_size 4 +#endif /** \brief The list of all available network model models * \ingroup SURF_models */ -extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[]; +XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[surf_network_model_description_size]; /** \brief Workstation model extension public * \ingroup SURF_models @@ -381,6 +405,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); + surf_action_t(*execute_parallel_task) (int workstation_nb, /**< Execute a parallel task on several workstations */ void **workstation_list, double *computation_amount, @@ -463,11 +488,11 @@ XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char *filename); */ XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename); -extern XBT_PUBLIC_DATA(int) surf_workstation_model_description_size; +#define surf_workstation_model_description_size 4 /** \brief The list of all available workstation model models * \ingroup SURF_models */ -extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[]; +XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[surf_workstation_model_description_size]; /** \brief The network links * \ingroup SURF_models @@ -476,17 +501,17 @@ extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_descri * * \see workstation_set */ -XBT_PUBLIC_DATA(xbt_dict_t) network_link_set; +XBT_PUBLIC_DATA(xbt_dict_t) link_set; /** \brief The workstations * \ingroup SURF_models * * This dict contains all workstations. * - * \see network_link_set + * \see link_set */ XBT_PUBLIC_DATA(xbt_dict_t) workstation_set; - +XBT_PUBLIC_DATA(xbt_dict_t) cpu_set; /** \brief List of initialized models * \ingroup SURF_models */ @@ -540,6 +565,52 @@ XBT_PUBLIC(double)surf_get_clock(void); */ 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) */ +void parse_properties(void); +void free_string(void*); + +/* Prototypes for functions handling routing and were factorized succesfully from the models */ +void init_data(void); +void parse_route_elem(void); + +/* surf parse file related (public because called from a test suite) */ +XBT_PUBLIC(void) parse_platform_file(const char* file); + +/* Stores the sets */ +XBT_PUBLIC_DATA(xbt_dict_t) set_list; + +void parse_foreach(void); +void parse_sets(void); +void parse_route_multi_set_endpoints(void); +void parse_route_multi_set_route(void); +void parse_cluster(void); +void parse_trace_init(void); +void parse_trace_finalize(void); +void parse_trace_c_connect(void); + +void manage_route(xbt_dict_t route_table, const char* route_name, int action, int isMultiRoute); +XBT_PUBLIC_DATA(int) route_action; + +/* This is used by all models when creating the routing table while parsing */ +XBT_PUBLIC_DATA(xbt_dict_t) route_table; +XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table; +XBT_PUBLIC_DATA(xbt_dict_t) route_table; +XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table; +XBT_PUBLIC_DATA(xbt_dynar_t) route_link_list; + +/* For the trace and trace:connect tag (store their content till the end of the parsing) */ +XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; +XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail; +XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power; +XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail; +XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth; +XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency; + + +double get_cpu_power(const char* power); +void init_randomness(void); +void add_randomness(void); SG_END_DECL()