X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..fe832229f8b8467994bac54665117823e7ed97e9:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 3de212bc1b..24d45a2db3 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -22,6 +22,11 @@ SG_BEGIN_DECL() SURF_RESOURCE_OFF = 0 /**< Down & broken */ } e_surf_resource_state_t; + typedef enum { + SURF_LINK_SHARED = 1, + SURF_LINK_FATPIPE = 0 + } e_surf_link_sharing_policy_t; + /** @Brief Specify that we use that action */ XBT_PUBLIC(void) surf_action_ref(surf_action_t action); /** @brief Creates a new action. @@ -34,7 +39,12 @@ XBT_PUBLIC(void) surf_action_ref(surf_action_t action); XBT_PUBLIC(void *) surf_action_new(size_t size, double cost, surf_model_t model, int failed); +/** + * FIXME : still improvaleb [this should be done in the binding code] + */ +XBT_PUBLIC(void) workstation_link_create_resource(char *name, + double initial_bandwidth,double initial_latency); /** \brief Resource model description */ @@ -70,6 +80,8 @@ XBT_PUBLIC(void) model_help(const char* category, s_surf_model_description_t * t the task is completed) */ double remains; /**< How much of that cost remains to * be done in the currently running task */ + int latency_limited; /**< Set to 1 if is limited by latency, 0 otherwise */ + double start; /**< start time */ double finish; /**< finish time : this is modified during the run * and fluctuates until the task is completed */ @@ -154,6 +166,13 @@ XBT_PUBLIC_DATA(routing_t) used_routing; 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, + double power_scale, + tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties); + void (*add_traces)(void); } s_surf_model_extension_cpu_t; /* Network model */ @@ -171,6 +190,17 @@ XBT_PUBLIC_DATA(routing_t) used_routing; double (*get_link_bandwidth) (const void *link); double (*get_link_latency) (const void *link); int (*link_shared) (const void *link); + void (*add_traces)(void); + void (*create_resource)(char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy, + xbt_dict_t properties); } s_surf_model_extension_network_t; /** \brief Workstation model extension public @@ -198,9 +228,21 @@ XBT_PUBLIC_DATA(routing_t) used_routing; 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 */ int (*link_shared) (const void *link); - xbt_dict_t(*get_properties) (const void *resource); + xbt_dict_t(*get_properties) (const void *resource); + void (*link_create_resource) (char *name,double bw_initial,double lat_initial); + void (*cpu_create_resource)(char *name, double power_peak, + double power_scale, + tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties); + void (*add_traces) (void); + } s_surf_model_extension_workstation_t; + + + /** \brief Model datatype * \ingroup SURF_models * @@ -229,15 +271,14 @@ XBT_PUBLIC_DATA(routing_t) used_routing; 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 */ double (*get_remains) (surf_action_t action);/**< Get the remains of an action */ + int (*get_latency_limited) (surf_action_t action);/**< Return 1 if action is limited by latency, 0 otherwise */ 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; @@ -330,6 +371,11 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[]; XBT_PUBLIC(void) create_workstations(void); +/**\brief create new host bypass the parser + * + */ + + /** \brief The network model * \ingroup SURF_models * @@ -340,6 +386,18 @@ 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 + * + * 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 surf_workstation_model_init_SMPI() + */ +XBT_PUBLIC(void) surf_network_model_init_SMPI(const char *filename); + /** \brief Initializes the platform with the network model 'LagrangeVelho' * \ingroup SURF_models * \param filename XML platform file name @@ -379,6 +437,11 @@ XBT_PUBLIC(void) surf_network_model_init_Vivaldi(const char *filename); */ XBT_PUBLIC(void) surf_network_model_init_CM02(const char *filename); +/** + * brief initialize the the network model bypassing the XML parser + */ +XBT_PUBLIC(void) surf_network_model_init_bypass(const char* id,double initial_bw,double initial_lat); + #ifdef HAVE_GTNETS /** \brief Initializes the platform with the network model GTNETS * \ingroup SURF_models @@ -615,6 +678,74 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency; XBT_PUBLIC(double) get_cpu_power(const char *power); +/*public interface to create resource bypassing the parser via cpu/network model + * + * see surfxml_parse.c + * */ +XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak, + double power_scale, + tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties); + +/*public interface to create resource bypassing the parser via workstation_ptask_L07 model + * + * see surfxml_parse.c + * */ +XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name, double power_peak, + double power_scale, + tmgr_trace_t power_trace, + e_surf_resource_state_t state_initial, + tmgr_trace_t state_trace, + xbt_dict_t cpu_properties); +/** + * create link resource + * see surfxml_parse.c + */ +XBT_PUBLIC(void) surf_link_create_resource(char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t policy, + xbt_dict_t properties); + + +XBT_PUBLIC(void) surf_wsL07_link_create_resource(char *name, + double bw_initial,double lat_initial); +/** + * add route element (link_ctn) bypassing the parser + * + * see surfxml_parse.c + * + */ +XBT_PUBLIC(void) surf_add_route_element(char *link_ctn_id); + +/** + * set route src_id,dest_id, and create a route resource + * + * see surf_routing.c && surfxml_parse.c + */ +XBT_PUBLIC(void) surf_route_set_resource(char* src_id,char *dest_id,xbt_dynar_t links_id,int action); +XBT_PUBLIC(void) surf_set_routes(void); +/** + * add host to routing model ( xbt_dict ) + * + */ +XBT_PUBLIC(void) surf_route_add_host(char * host_id); + +/** + * add traces + * see surfxml_parse.c + */ +XBT_PUBLIC(void) surf_add_host_traces(void); +XBT_PUBLIC(void) surf_add_link_traces(void); +XBT_PUBLIC(void) surf_wsL07_add_traces(void); + #include "surf/surf_resource.h" #include "surf/surf_resource_lmm.h"