X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e082217ec28452a0f8fdb0207d8792f0b0932dc..a3848e5ea6b2305d6059c89705edaccbec356455:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index a9a70639be..c449f44bbe 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -33,7 +33,7 @@ typedef enum { SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2, SURF_TRACE_CONNECT_KIND_BANDWIDTH = 1, SURF_TRACE_CONNECT_KIND_LATENCY = 0 -} e_surf_trace_connect_kin_t; +} e_surf_trace_connect_kind_t; typedef enum { SURF_PROCESS_ON_FAILURE_DIE = 1, @@ -70,6 +70,11 @@ 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); +typedef xbt_dictelm_t sg_host_t; +static inline char* sg_host_name(sg_host_t host) { + return host->key; +} + /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -83,7 +88,8 @@ XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const typedef struct { const char* id; - double power_peak; + xbt_dynar_t power_peak; + int pstate; int core_amount; double power_scale; tmgr_trace_t power_trace; @@ -93,16 +99,16 @@ typedef struct { xbt_dict_t properties; } 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 = A_surfxml_host_state_ON, \ - .power_trace = NULL, \ - .state_trace = NULL, \ - .coord = NULL, \ - .properties = NULL \ +#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\ } typedef struct { @@ -138,9 +144,9 @@ typedef struct { .bandwidth_trace = NULL,\ .latency = 0.,\ .latency_trace = NULL,\ - .state = A_surfxml_link_state_ON,\ + .state = SURF_RESOURCE_ON,\ .state_trace = NULL,\ - .policy = A_surfxml_link_sharing_policy_SHARED,\ + .policy = SURF_LINK_SHARED,\ .properties = NULL\ } @@ -182,6 +188,10 @@ typedef struct s_sg_platf_cluster_cbarg { double lat; double bb_bw; double bb_lat; + double loopback_bw; + double loopback_lat; + double limiter_link; + xbt_dict_t properties; const char* router_id; e_surf_link_sharing_policy_t sharing_policy; e_surf_link_sharing_policy_t bb_sharing_policy; @@ -190,7 +200,7 @@ typedef struct s_sg_platf_cluster_cbarg { } 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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL} typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t; typedef struct s_sg_platf_cabinet_cbarg { @@ -209,9 +219,10 @@ typedef struct { const char* id; const char* type_id; const char* content; + xbt_dict_t properties; } s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t; -#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL} +#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL} typedef struct { const char* id; @@ -257,7 +268,7 @@ typedef struct s_sg_platf_trace_cbarg { typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t; typedef struct s_sg_platf_trace_connect_cbarg { - e_surf_trace_connect_kin_t kind; + e_surf_trace_connect_kind_t kind; const char *trace; const char *element; } s_sg_platf_trace_connect_cbarg_t; @@ -282,10 +293,21 @@ typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t; typedef struct s_sg_platf_AS_cbarg { const char *id; int routing; - xbt_dict_t properties; } s_sg_platf_AS_cbarg_t; -#define SG_PLATF_AS_INITIALIZER {NULL,0,NULL} +#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} + +/* ***************************************** */ XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform XBT_PUBLIC(void) sg_platf_end(void); // Finish the creation of the platform @@ -308,7 +330,7 @@ XBT_PUBLIC(void) sg_platf_new_bypassASroute (sg_platf_route_cbarg_t bypassASrout 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_new_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect); +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 @@ -318,6 +340,11 @@ 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 @@ -328,4 +355,8 @@ 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); + + #endif /* SG_PLATF_H */