X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4302d47da5fe39de9b87271c9a977cd86da51bb..db82f9e75280108116a8e70d2e7a163080020d29:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 310ecd0159..65694ccc28 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -10,6 +10,7 @@ #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" @@ -22,6 +23,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 */ @@ -65,6 +80,13 @@ enum heap_action_type{ NOTSET }; + +typedef struct surf_resource { + surf_model_t model; + char *name; + xbt_dict_t properties; +} s_surf_resource_t, *surf_resource_t; + /** \ingroup SURF_actions * \brief Action structure * @@ -78,25 +100,32 @@ typedef struct surf_action { xbt_swag_t state_set; double cost; /**< cost */ double priority; /**< priority (1.0 by default) */ + double bound; /**< the capping of the CPU use */ double max_duration; /**< max_duration (may fluctuate until - the task is completed) */ + the task is completed) */ double remains; /**< How much of that cost remains to - * be done in the currently running task */ + * be done in the currently running task */ #ifdef HAVE_LATENCY_BOUND_TRACKING int latency_limited; /**< Set to 1 if is limited by latency, 0 otherwise */ #endif double start; /**< start time */ double finish; /**< finish time : this is modified during the run - * and fluctuates until the task is completed */ + * and fluctuates until the task is completed */ void *data; /**< for your convenience */ int refcount; - surf_model_t model_type; + + /* The previous name was model_type. For VM support, we have to distinguish a + * model type and its model object. Thus, we use model_obj here. The type of + * a model object is available by looking at the inside of the model object. */ + surf_model_t model_obj; /**< the surf model object */ + #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 */ + xbt_dict_t ls_dict; } s_surf_action_t; typedef struct surf_action_lmm { @@ -152,6 +181,16 @@ typedef struct surf_action_state { typedef struct s_routing_platf s_routing_platf_t, *routing_platf_t; XBT_PUBLIC_DATA(routing_platf_t) routing_platf; +/******************************************* + * TUTORIAL: New model + * New model extension public + * Public functions specific to a New model. + */ +typedef struct surf_new_model_extension_public { + surf_action_t(*fct) (); + void* (*create_resource) (); +} s_surf_model_extension_new_model_t; +/*******************************************/ /** \ingroup SURF_models * \brief Private data available on all models @@ -171,13 +210,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; @@ -197,16 +229,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 */ @@ -220,20 +242,24 @@ 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, size_t size, size_t nmemb, surf_file_t stream); + 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); - void* (*create_resource) (const char* id, const char* model, const char* type_id, const char *content); + surf_action_t(*unlink) (void *storage, surf_file_t stream); + surf_action_t(*ls) (void *storage, const char *path); } s_surf_model_extension_storage_t; - /** \ingroup SURF_models - * \brief Workstation model extension public - * - * Public functions specific to the workstation model. - */ +/** \ingroup SURF_models + * \brief Workstation model extension public + * + * Public functions specific to the workstation model. + */ typedef struct surf_workstation_model_extension_public { + /* This points to the surf cpu model object bound to the workstation model. */ + surf_model_t cpu_model; + surf_action_t(*execute) (void *workstation, double size); /**< Execute a computation amount on a workstation - and create the corresponding action */ + and create the corresponding action */ surf_action_t(*sleep) (void *workstation, double duration); /**< Make a workstation sleep during a given duration */ e_surf_resource_state_t(*get_state) (void *workstation); /**< Return the CPU state of a workstation */ double (*get_speed) (void *workstation, double load); /**< Return the speed of a workstation */ @@ -256,30 +282,67 @@ typedef struct surf_workstation_model_extension_public { 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(*ls) (void *workstation, const char* mount, const char *path); + 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); + void (*get_params) (void *ind_vm_ws, ws_params_t param); + void (*set_params) (void *ind_vm_ws, ws_params_t param); + xbt_dynar_t (*get_vms) (void *ind_vm_ws); + } s_surf_model_extension_workstation_t; +typedef struct surf_vm_workstation_model_extension_public { + /* The vm workstation model object has all members of the physical machine + * workstation model object. If these members are correctly initialized also + * in the vm workstation model object, we can access the vm workstation model + * object as if it is the pm workstatoin model object. + * + * But, it's not so clean. Think it again later. + * */ + s_surf_model_extension_workstation_t basic; + + // start does not appear here as it corresponds to turn the state from created to running (see smx_vm.c) + + void (*create) (const char *name, void *ind_phys_workstation); // First operation of the VM model + void (*destroy) (void *ind_vm_ws); // will be vm_ws_destroy(), which destroies the vm-workstation-specific data + void (*suspend) (void *ind_vm_ws); + void (*resume) (void *ind_vm_ws); + void (*save) (void *ind_vm_ws); + void (*restore) (void *ind_vm_ws); + + void (*migrate) (void *ind_vm_ws, void *ind_vm_ws_dest); // will be vm_ws_migrate() + + int (*get_state) (void *ind_vm_ws); + void (*set_state) (void *ind_vm_ws, int state); + + void * (*get_pm) (void *ind_vm_ws); // will be vm_ws_get_pm() + + void (*set_vm_bound) (void *ind_vm_ws, double bound); // will be vm_ws_set_vm_bound() + +} s_surf_model_extension_vm_workstation_t; + +/** \ingroup SURF_models + * \brief Model types + * + * The type of the model object. For example, we will have two model objects + * of the surf cpu model. One is for physical machines, and the other is for + * virtual machines. + * + */ +typedef enum { + SURF_MODEL_TYPE_CPU = 0, + SURF_MODEL_TYPE_NETWORK, + SURF_MODEL_TYPE_STORAGE, + SURF_MODEL_TYPE_WORKSTATION, + SURF_MODEL_TYPE_VM_WORKSTATION, + SURF_MODEL_TYPE_NEW_MODEL +} e_surf_model_type_t; /** \ingroup SURF_models * \brief Model datatype @@ -291,7 +354,9 @@ typedef struct surf_model { const char *name; /**< Name of this model */ s_surf_action_state_t states; /**< Any living action on this model */ - e_surf_action_state_t(*action_state_get) (surf_action_t action); + e_surf_model_type_t type; /**< See e_surf_model_type_t */ + + e_surf_action_state_t(*action_state_get) (surf_action_t action); /**< Return the state of an action */ void (*action_state_set) (surf_action_t action, e_surf_action_state_t state); @@ -308,6 +373,7 @@ typedef struct surf_model { 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_bound) (surf_action_t action, double bound); /**< Set the bound (the maximum CPU utilization) of an action */ #ifdef HAVE_TRACING void (*set_category) (surf_action_t action, const char *category); /**< Set the category of an action */ #endif @@ -325,27 +391,46 @@ typedef struct surf_model { s_surf_model_extension_network_t network; s_surf_model_extension_storage_t storage; s_surf_model_extension_workstation_t workstation; + // TODO Implement the corresponding model + s_surf_model_extension_vm_workstation_t vm_workstation; + /*******************************************/ + /* TUTORIAL: New model */ + s_surf_model_extension_new_model_t new_model; + /*******************************************/ } extension; } s_surf_model_t; 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 { - surf_model_t model; - char *name; - xbt_dict_t properties; -} s_surf_resource_t, *surf_resource_t; +static inline surf_model_t surf_resource_model(const void *host, int level) { + /* If level is SURF_WKS_LEVEL, ws is a workstation_CLM03 object. It has + * surf_resource at the generic_resource field. */ + surf_resource_t ws = xbt_lib_get_level((void *) host, level); + return ws->model; +} + + /** * Resource which have a metric handled by a maxmin system @@ -370,9 +455,14 @@ typedef struct surf_resource_lmm { /** \ingroup SURF_models - * \brief The CPU model + * \brief The CPU model object for the physical machine layer + */ +XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model_pm; + +/** \ingroup SURF_models + * \brief The CPU model object for the virtual machine layer */ -XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model; +XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model_vm; /** \ingroup SURF_models * \brief Initializes the CPU model with the model Cas01 @@ -382,10 +472,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); @@ -393,19 +480,8 @@ 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); +XBT_PUBLIC(surf_model_t) surf_cpu_model_init_ti(void); /** \ingroup SURF_models * \brief The list of all available optimization modes (both for cpu and networks). @@ -418,8 +494,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 * */ @@ -474,21 +548,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 @@ -567,11 +632,6 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(void); XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[]; - - - - - /** \ingroup SURF_models * \brief The storage model */ @@ -583,12 +643,6 @@ XBT_PUBLIC(void) surf_storage_model_init_default(void); */ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_storage_model_description[]; - - - - - - /** \ingroup SURF_models * \brief The workstation model * @@ -599,6 +653,16 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_storage_model_description[]; */ XBT_PUBLIC_DATA(surf_model_t) surf_workstation_model; +/** \ingroup SURF_models + * \brief The vm_workstation model + * + * Note that when you create an API on top of SURF, + * the vm_workstation model should be the only one you use + * because depending on the platform model, the network model and the CPU model + * may not exist. + */ +XBT_PUBLIC_DATA(surf_model_t) surf_vm_workstation_model; + /** \ingroup SURF_models * \brief Initializes the platform with a compound workstation model * @@ -620,18 +684,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 * @@ -648,15 +700,32 @@ XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(void); XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[]; +/******************************************* + * TUTORIAL: New model + */ +XBT_PUBLIC(void) surf_new_model_init_default(void); +XBT_PUBLIC_DATA(s_surf_model_description_t) surf_new_model_description[]; +/*******************************************/ + /** \ingroup SURF_models * \brief List of initialized models */ XBT_PUBLIC_DATA(xbt_dynar_t) model_list; +XBT_PUBLIC_DATA(xbt_dynar_t) model_list_invoke; + +/*******************************************/ +/*** 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); + /*******************************************/ /*** SURF Globals **************************/ /*******************************************/ -XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; /** \ingroup SURF_simulation * \brief Initialize SURF @@ -666,9 +735,9 @@ XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; * 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 */ @@ -710,14 +779,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; @@ -729,8 +794,36 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency; XBT_PUBLIC(double) get_cpu_power(const char *power); +XBT_PUBLIC(xbt_dict_t) get_as_router_properties(const char* name); + int surf_get_nthreads(void); 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 */