X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eee21ec5f99218189fc98898a09150294cd0fbf4..32e70034e357fcad920962e4ed35fcbf8dd59283:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index b888225419..0a0df2582b 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -1,6 +1,6 @@ /* platf.h - Public interface to the SimGrid platforms */ -/* Copyright (c) 2004-2013. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -10,19 +10,17 @@ #define SG_PLATF_H #include +#include + +SG_BEGIN_DECL() typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/ -typedef struct RoutingEdge *sg_routing_edge_t; +typedef RoutingEdge *sg_routing_edge_t; -#ifdef __cplusplus -extern "C" { -#endif XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name); -#ifdef __cplusplus -} -#endif -/** Defines whether a given resource is working or not */ +/** @ingroup SURF_interface +* @brief Defines whether a given resource is working or not */ typedef enum { SURF_RESOURCE_ON = 1, /**< Up & ready */ SURF_RESOURCE_OFF = 0 /**< Down & broken */ @@ -47,15 +45,18 @@ typedef enum { SURF_PROCESS_ON_FAILURE_RESTART = 0 } e_surf_process_on_failure_t; +typedef enum { + SURF_CLUSTER_FAT_TREE=2, + SURF_CLUSTER_FLAT = 1, + SURF_CLUSTER_TORUS = 0 +} e_surf_cluster_topology_t; + typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ /** opaque structure defining a event generator for availability based on a probability distribution */ typedef struct probabilist_event_generator *probabilist_event_generator_t; -#ifdef __cplusplus -extern "C" { -#endif XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char *filename); XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, const char *input, @@ -80,22 +81,20 @@ XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(c XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const char* id, double scale, double shape); -#ifdef __cplusplus -} -#endif - -typedef xbt_dictelm_t sg_host_t; -static inline char* sg_host_name(sg_host_t host) { - return host->key; -} typedef xbt_dictelm_t sg_storage_t; static inline char* sg_storage_name(sg_storage_t storage) { return storage->key; } -/* Type for any integer storage size */ -typedef uint64_t sg_storage_size_t; +/** @ingroup m_datatypes_management_details + * @brief Type for any simgrid size + */ +typedef unsigned long long sg_size_t; +/** @ingroup m_datatypes_management_details + * @brief Type for any simgrid offset + */ +typedef long long sg_offset_t; /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -109,11 +108,11 @@ typedef uint64_t sg_storage_size_t; typedef struct { const char* id; - xbt_dynar_t power_peak; + xbt_dynar_t speed_peak; int pstate; int core_amount; - double power_scale; - tmgr_trace_t power_trace; + double speed_scale; + tmgr_trace_t speed_trace; e_surf_resource_state_t initial_state; tmgr_trace_t state_trace; const char* coord; @@ -121,16 +120,9 @@ typedef struct { } s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t; #define SG_PLATF_HOST_INITIALIZER { \ - .id = NULL,\ - .power_peak = 0,\ - .core_amount = 1.,\ - .power_scale = 1,\ - .initial_state = SURF_RESOURCE_ON,\ - .power_trace = NULL,\ - .state_trace = NULL,\ - .coord = NULL,\ - .properties = NULL\ - } + NULL, 0, 1, 1, 1., NULL, SURF_RESOURCE_ON, NULL, \ + NULL, NULL \ +} typedef struct { const char* id; @@ -160,21 +152,14 @@ typedef struct { } s_sg_platf_link_cbarg_t, *sg_platf_link_cbarg_t; #define SG_PLATF_LINK_INITIALIZER {\ - .id = NULL,\ - .bandwidth = 0.,\ - .bandwidth_trace = NULL,\ - .latency = 0.,\ - .latency_trace = NULL,\ - .state = SURF_RESOURCE_ON,\ - .state_trace = NULL,\ - .policy = SURF_LINK_SHARED,\ - .properties = NULL\ + NULL, 0., NULL, 0., NULL, SURF_RESOURCE_ON, \ + NULL, SURF_LINK_SHARED, NULL \ } typedef struct s_sg_platf_peer_cbarg *sg_platf_peer_cbarg_t; typedef struct s_sg_platf_peer_cbarg { const char* id; - double power; + double speed; double bw_in; double bw_out; double lat; @@ -183,7 +168,7 @@ typedef struct s_sg_platf_peer_cbarg { tmgr_trace_t state_trace; } s_sg_platf_peer_cbarg_t; -#define SG_PLATF_PEER_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL} +#define SG_PLATF_PEER_INITIALIZER {NULL,0.0,0.0,0.0,0.0,NULL,NULL,NULL} typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; typedef struct s_sg_platf_route_cbarg { @@ -195,7 +180,7 @@ typedef struct s_sg_platf_route_cbarg { xbt_dynar_t link_list; } s_sg_platf_route_cbarg_t; -#define SG_PLATF_ROUTE_INITIALIZER {TRUE,NULL,NULL,NULL,NULL,NULL} +#define SG_PLATF_ROUTE_INITIALIZER {1,NULL,NULL,NULL,NULL,NULL} typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t; typedef struct s_sg_platf_cluster_cbarg { @@ -203,7 +188,7 @@ typedef struct s_sg_platf_cluster_cbarg { const char* prefix; const char* suffix; const char* radical; - double power; + double speed; int core_amount; double bw; double lat; @@ -212,6 +197,8 @@ typedef struct s_sg_platf_cluster_cbarg { double loopback_bw; double loopback_lat; double limiter_link; + e_surf_cluster_topology_t topology; + const char* topo_parameters; xbt_dict_t properties; const char* router_id; e_surf_link_sharing_policy_t sharing_policy; @@ -220,8 +207,11 @@ typedef struct s_sg_platf_cluster_cbarg { const char* state_trace; } s_sg_platf_cluster_cbarg_t; -#define SG_PLATF_CLUSTER_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL \ - ,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL} +#define SG_PLATF_CLUSTER_INITIALIZER {NULL,NULL,NULL,NULL,0.0,1 \ + ,1.,1.,0.,0.,0.,0.,0. \ + ,SURF_CLUSTER_FLAT,NULL,NULL,NULL, \ + SURF_LINK_SHARED,SURF_LINK_SHARED,NULL \ + ,NULL} typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t; typedef struct s_sg_platf_cabinet_cbarg { @@ -229,12 +219,12 @@ typedef struct s_sg_platf_cabinet_cbarg { const char* prefix; const char* suffix; const char* radical; - double power; + double speed; double bw; double lat; } s_sg_platf_cabinet_cbarg_t; -#define SG_PLATF_CABINET_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL,NULL} +#define SG_PLATF_CABINET_INITIALIZER {NULL,NULL,NULL,NULL,0.0,0.0,0.0} typedef struct { const char* id; @@ -242,9 +232,10 @@ typedef struct { const char* content; const char* content_type; xbt_dict_t properties; + const char* attach; } s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t; -#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL} +#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL} typedef struct { const char* id; @@ -252,10 +243,11 @@ typedef struct { const char* content; const char* content_type; xbt_dict_t properties; - sg_storage_size_t size; + xbt_dict_t model_properties; + sg_size_t size; } s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t; -#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL} +#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL} typedef struct { const char* type_id; @@ -287,7 +279,7 @@ typedef struct s_sg_platf_trace_cbarg { const char *pc_data; } s_sg_platf_trace_cbarg_t; -#define SG_PLATF_TRACE_INITIALIZER {NULL,NULL,NULL,NULL} +#define SG_PLATF_TRACE_INITIALIZER {NULL,NULL,0.0,NULL} typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t; typedef struct s_sg_platf_trace_connect_cbarg { @@ -296,7 +288,7 @@ typedef struct s_sg_platf_trace_connect_cbarg { const char *element; } s_sg_platf_trace_connect_cbarg_t; -#define SG_PLATF_TRACE_CONNECT_INITIALIZER {NULL,NULL,NULL} +#define SG_PLATF_TRACE_CONNECT_INITIALIZER {SURF_TRACE_CONNECT_KIND_LATENCY,NULL,NULL} typedef struct s_sg_platf_process_cbarg *sg_platf_process_cbarg_t; typedef struct s_sg_platf_process_cbarg { @@ -310,7 +302,7 @@ typedef struct s_sg_platf_process_cbarg { e_surf_process_on_failure_t on_failure; } s_sg_platf_process_cbarg_t; -#define SG_PLATF_PROCESS_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL} +#define SG_PLATF_PROCESS_INITIALIZER {NULL,0,NULL,NULL,NULL,-1.0,-1.0,SURF_PROCESS_ON_FAILURE_DIE} typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t; typedef struct s_sg_platf_AS_cbarg { @@ -321,20 +313,6 @@ typedef struct s_sg_platf_AS_cbarg { #define SG_PLATF_AS_INITIALIZER {NULL,0} /* ***************************************** */ -/* TUTORIAL: New TAG */ - -typedef struct s_sg_platf_gpu_cbarg *sg_platf_gpu_cbarg_t; -typedef struct s_sg_platf_gpu_cbarg { - const char *name; -} s_sg_platf_gpu_cbarg_t; - -#define SG_PLATF_GPU_INITIALIZER {NULL} - -/* ***************************************** */ - -#ifdef __cplusplus -extern "C" { -#endif XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform XBT_PUBLIC(void) sg_platf_end(void); // Finish the creation of the platform @@ -354,12 +332,10 @@ XBT_PUBLIC(void) sg_platf_new_route (sg_platf_route_cbarg_t route); // Add a rou XBT_PUBLIC(void) sg_platf_new_ASroute (sg_platf_route_cbarg_t ASroute); // Add an ASroute XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_route_cbarg_t bypassroute); // Add a bypassRoute XBT_PUBLIC(void) sg_platf_new_bypassASroute (sg_platf_route_cbarg_t bypassASroute); // Add an bypassASroute -XBT_PUBLIC(void) sg_platf_new_prop (sg_platf_prop_cbarg_t prop); // Add a prop XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace); XBT_PUBLIC(void) sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); -XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS XBT_PUBLIC(void) sg_platf_new_storage(sg_platf_storage_cbarg_t storage); // Add a storage to the currently described AS XBT_PUBLIC(void) sg_platf_new_mstorage(sg_platf_mstorage_cbarg_t mstorage); XBT_PUBLIC(void) sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type); @@ -367,11 +343,6 @@ XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount); XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process); -/* ***************************************** */ -/* TUTORIAL: New TAG */ -XBT_PUBLIC(void) sg_platf_new_gpu(sg_platf_gpu_cbarg_t gpu); -/* ***************************************** */ - // Add route and Asroute without xml file with those functions XBT_PUBLIC(void) sg_platf_route_begin (sg_platf_route_cbarg_t route); // Initialize route XBT_PUBLIC(void) sg_platf_route_end (sg_platf_route_cbarg_t route); // Finalize and add a route @@ -382,11 +353,6 @@ XBT_PUBLIC(void) sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute); // Final XBT_PUBLIC(void) sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route); // Add a link to link list XBT_PUBLIC(void) sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASroute); // Add a link to link list -typedef void (*sg_platf_process_cb_t)(sg_platf_process_cbarg_t); -XBT_PUBLIC(void) sg_platf_process_add_cb(sg_platf_process_cb_t fct); - -#ifdef __cplusplus -} -#endif +SG_END_DECL() #endif /* SG_PLATF_H */