X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0eb7621025a933db4ac7fbbec8e4646dd8bc279e..a251a46feac3eac126243e066a947e153464a29e:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index eace0c2711..f401c3617e 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -44,6 +44,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, @@ -140,9 +141,10 @@ typedef struct surf_model_public { 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 */ - void (*set_callback) (void *resource, void value, void *function, void *arg); - int (*get_callback) (void **resource, void *value, void **function, void **arg); 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 @@ -201,8 +203,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 @@ -243,11 +245,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; +XBT_PUBLIC_DATA(int) surf_cpu_model_description_size; /** \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[]; /* Network model */ @@ -276,6 +278,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 * @@ -362,11 +366,11 @@ XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename); -extern XBT_PUBLIC_DATA(int) surf_network_model_description_size; +XBT_PUBLIC_DATA(int) surf_network_model_description_size; /** \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[]; /** \brief Workstation model extension public * \ingroup SURF_models @@ -383,6 +387,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, @@ -465,11 +470,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; +XBT_PUBLIC_DATA(int) surf_workstation_model_description_size; /** \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[]; /** \brief The network links * \ingroup SURF_models @@ -478,17 +483,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 */ @@ -542,6 +547,47 @@ 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 */ +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 */ +XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; +XBT_PUBLIC_DATA(xbt_dynar_t) traces_connect_list; + +double get_cpu_power(const char* power); +void init_randomness(void); +void add_randomness(void); SG_END_DECL()