X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/35b2bd8caf5cc05258414666d9577b39a259cfbd..e1973b337aa4a275d58f5f934f899291612b698a:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index f5de0740f2..ae2e61dd1a 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -10,8 +10,8 @@ #include "xbt/swag.h" #include "xbt/dynar.h" #include "xbt/dict.h" +#include "xbt/graph.h" #include "xbt/misc.h" -#include "xbt/file_stat.h" #include "portable.h" #include "xbt/config.h" #include "surf/datatypes.h" @@ -22,6 +22,20 @@ SG_BEGIN_DECL() /* Actions and models are highly connected structures... */ +/* user-visible parameters */ +extern double sg_tcp_gamma; +extern double sg_sender_gap; +extern double sg_latency_factor; +extern double sg_bandwidth_factor; +extern double sg_weight_S_parameter; +extern int sg_network_crosstraffic; +#ifdef HAVE_GTNETS +extern double sg_gtnets_jitter; +extern int sg_gtnets_jitter_seed; +#endif +extern xbt_dynar_t surf_path; + + typedef enum { SURF_NETWORK_ELEMENT_NULL = 0, /* NULL */ SURF_NETWORK_ELEMENT_HOST, /* host type */ @@ -96,7 +110,6 @@ typedef struct surf_action { 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 */ xbt_dict_t ls_dict; } s_surf_action_t; @@ -182,13 +195,6 @@ typedef struct surf_cpu_model_extension_public { 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) (const 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); void (*add_traces) (void); } s_surf_model_extension_cpu_t; @@ -208,16 +214,6 @@ typedef struct surf_network_model_extension_public { double (*get_link_latency) (const void *link); int (*link_shared) (const void *link); void (*add_traces) (void); - void* (*create_resource) (const 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; /* Storage model */ @@ -229,14 +225,14 @@ typedef struct surf_network_model_extension_public { */ typedef struct surf_storage_model_extension_public { - surf_action_t(*open) (void *storage, const char* mount, const char* path, const char* mode); - surf_action_t(*close) (void *storage, surf_file_t fp); - surf_action_t(*read) (void *storage, void* ptr, double 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); - surf_action_t(*unlink) (void *storage, surf_file_t stream); + surf_action_t(*open) (void *storage, const char* mount, const char* path); + surf_action_t(*close) (void *storage, surf_file_t fd); + surf_action_t(*read) (void *storage, void* ptr, size_t size, + surf_file_t fd); + surf_action_t(*write) (void *storage, const void* ptr, size_t size, + surf_file_t fd); + surf_action_t(*stat) (void *storage, surf_file_t fd); surf_action_t(*ls) (void *storage, const char *path); - void* (*create_resource) (const char* id, const char* model, const char* type_id, const char *content); } s_surf_model_extension_storage_t; /** \ingroup SURF_models @@ -264,32 +260,20 @@ typedef struct surf_workstation_model_extension_public { 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, surf_file_t fp); - surf_action_t(*read) (void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream); - surf_action_t(*write) (void *workstation, const void* ptr, size_t size, size_t nmemb, surf_file_t stream); - surf_action_t(*stat) (void *workstation, surf_file_t stream); - surf_action_t(*unlink) (void *workstation, surf_file_t stream); + surf_action_t(*open) (void *workstation, const char* storage, + const char* path); + surf_action_t(*close) (void *workstation, surf_file_t fd); + surf_action_t(*read) (void *workstation, void* ptr, size_t size, + surf_file_t fd); + surf_action_t(*write) (void *workstation, const void* ptr, size_t size, + surf_file_t fd); + surf_action_t(*stat) (void *workstation, surf_file_t fd); + int(*unlink) (void *workstation, surf_file_t fd); surf_action_t(*ls) (void *workstation, const char* mount, const char *path); + size_t (*get_size) (void *workstation, surf_file_t fd); int (*link_shared) (const void *link); xbt_dict_t(*get_properties) (const void *resource); - void* (*link_create_resource) (const 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); - void* (*cpu_create_resource) (const 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; @@ -351,14 +335,24 @@ typedef struct surf_model { surf_model_t surf_model_init(void); void surf_model_exit(surf_model_t model); +static inline void *surf_cpu_resource_priv(const void *host) { + return xbt_lib_get_level((void *)host, SURF_CPU_LEVEL); +} +static inline void *surf_workstation_resource_priv(const void *host){ + return xbt_lib_get_level((void *)host, SURF_WKS_LEVEL); +} +static inline void *surf_storage_resource_priv(const void *host){ + return xbt_lib_get_level((void *)host, SURF_STORAGE_LEVEL); +} + static inline void *surf_cpu_resource_by_name(const char *name) { - return xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL); + return xbt_lib_get_elm_or_null(host_lib, name); } static inline void *surf_workstation_resource_by_name(const char *name){ - return xbt_lib_get_or_null(host_lib, name, SURF_WKS_LEVEL); + return xbt_lib_get_elm_or_null(host_lib, name); } static inline void *surf_storage_resource_by_name(const char *name){ - return xbt_lib_get_or_null(storage_lib, name, SURF_STORAGE_LEVEL); + return xbt_lib_get_elm_or_null(storage_lib, name); } typedef struct surf_resource { @@ -402,10 +396,7 @@ XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model; * 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. - * - * \see surf_workstation_model_init_CLM03() + * You shouldn't have to call it by yourself. */ XBT_PUBLIC(void) surf_cpu_model_init_Cas01(void); @@ -413,20 +404,9 @@ XBT_PUBLIC(void) surf_cpu_model_init_Cas01(void); * \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 This function call the share resources function needed - * - */ -XBT_PUBLIC(double) generic_share_resources(double now); - -/** \brief This function call the update action state function needed - * - */ -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:... @@ -438,8 +418,6 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_optimization_mode_description[] */ 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 * */ @@ -494,21 +472,12 @@ XBT_PUBLIC(void) surf_network_model_init_Constant(void); /** \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 + * You sould call this function 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() */ XBT_PUBLIC(void) surf_network_model_init_CM02(void); -/** - * 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 /** \ingroup SURF_models * \brief Initializes the platform with the network model GTNETS @@ -629,18 +598,6 @@ XBT_PUBLIC(void) surf_workstation_model_init_compound(void); */ 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 - * model with the model CM02 and the CPU model with the model Cas01. - * In future releases, some other network models will be implemented and will be - * combined with the workstation model CLM03. - * - */ -XBT_PUBLIC(void) surf_workstation_model_init_CLM03(void); - /** \ingroup SURF_models * \brief Initializes the platform with the model KCCFLN05 * @@ -669,15 +626,20 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_new_model_description[]; */ XBT_PUBLIC_DATA(xbt_dynar_t) model_list; +/*******************************************/ +/*** SURF Platform *************************/ +/*******************************************/ +typedef struct s_as *AS_t; + +XBT_PUBLIC_DATA(AS_t) surf_AS_get_routing_root(void); +XBT_PUBLIC_DATA(const char *) surf_AS_get_name(AS_t as); +XBT_PUBLIC_DATA(xbt_dict_t) surf_AS_get_routing_sons(AS_t as); +XBT_PUBLIC_DATA(const char *) surf_AS_get_model(AS_t as); +XBT_PUBLIC_DATA(xbt_dynar_t) surf_AS_get_hosts(AS_t as); + /*******************************************/ /*** SURF Globals **************************/ /*******************************************/ -XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; -XBT_PUBLIC(int) surf_cfg_get_int(const char* name); -XBT_PUBLIC(double) surf_cfg_get_double(const char* name); -XBT_PUBLIC(char*) surf_cfg_get_string(const char* name); -XBT_PUBLIC(void) surf_cfg_get_peer(const char *name, char **peer, int *port); -XBT_PUBLIC(xbt_dynar_t) surf_cfg_get_dynar(const char* name); /** \ingroup SURF_simulation * \brief Initialize SURF @@ -687,9 +649,9 @@ XBT_PUBLIC(xbt_dynar_t) surf_cfg_get_dynar(const char* name); * 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() + * e.g. surf_workstation_model_init_CM02() * - * \see surf_workstation_model_init_CLM03(), surf_workstation_model_init_compound(), surf_exit() + * \see surf_workstation_model_init_CM02(), surf_workstation_model_init_compound(), surf_exit() */ XBT_PUBLIC(void) surf_init(int *argc, char **argv); /* initialize common structures */ @@ -731,14 +693,10 @@ 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(void) parse_properties(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; - /* 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; @@ -757,5 +715,29 @@ void surf_set_nthreads(int nthreads); void surf_watched_hosts(void); +/* + * Returns the initial path. On Windows the initial path is + * the current directory for the current process in the other + * case the function returns "./" that represents the current + * directory on Unix/Linux platforms. + */ +const char *__surf_get_initial_path(void); + +/********** Tracing **********/ +/* from surf_instr.c */ +void TRACE_surf_action(surf_action_t surf_action, const char *category); +void TRACE_surf_alloc(void); +void TRACE_surf_release(void); + +/* instr_routing.c */ +void instr_routing_define_callbacks (void); +void instr_new_variable_type (const char *new_typename, const char *color); +void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color); +void instr_new_user_state_type (const char *father_type, const char *new_typename); +void instr_new_value_for_user_state_type (const char *typename, const char *value, const char *color); +int instr_platform_traced (void); +xbt_graph_t instr_routing_platform_graph (void); +void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename); + SG_END_DECL() #endif /* _SURF_SURF_H */