X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc3419efe4d92bfa202543376995977c6a3171e9..daa638ffa57272cf7ecc9700971b6e1f3ec6e2dd:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index f5de0740f2..ef4d9d74d3 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,21 @@ 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_maxmin_selective_update; +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 */ @@ -182,13 +198,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 +217,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 */ @@ -236,7 +235,6 @@ typedef struct surf_storage_model_extension_public { surf_action_t(*stat) (void *storage, surf_file_t stream); surf_action_t(*unlink) (void *storage, surf_file_t stream); 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 @@ -245,6 +243,8 @@ typedef struct surf_storage_model_extension_public { * Public functions specific to the workstation model. */ typedef struct surf_workstation_model_extension_public { + surf_resource_t cpu; + surf_action_t(*execute) (void *workstation, double size); /**< Execute a computation amount on a workstation and create the corresponding action */ surf_action_t(*sleep) (void *workstation, double duration); /**< Make a workstation sleep during a given duration */ @@ -274,28 +274,20 @@ typedef struct surf_workstation_model_extension_public { 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; - - +typedef struct surf_vm_workstation_model_extension_public { + s_surf_model_extension_workstation_t basic; + void (*create) (const char *name, void *ind_phys_workstation); // First operation of the VM model + // start does not appear here as it corresponds to turn the state from created to running (see smx_vm.c) + int (*get_state) (void *ind_vm_workstation); + void (*set_state) (void *ind_vms_workstation, int state); + void (*migrate) (void *ind_vm_workstation, void *ind_dest_phys_workstation); // will be vm_ws_migrate() + const char * (*get_phys_host) (void *ind_vm_workstation); // will be vm_ws_get_phys_host() + void (*destroy) (void *ind_vm_workstation); // will be vm_ws_destroy(), which destroies the vm-workstation-specific data +} s_surf_model_extension_vm_workstation_t; /** \ingroup SURF_models * \brief Model datatype @@ -341,6 +333,8 @@ 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; @@ -351,14 +345,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 { @@ -608,6 +612,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 * @@ -672,12 +686,6 @@ XBT_PUBLIC_DATA(xbt_dynar_t) model_list; /*******************************************/ /*** 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 @@ -757,5 +765,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 */