X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43b4619af6da04808d1fd4be0dbfe6e279148b3a..f77cfc70ecec6f8e33fcd80a55ac2c3bb2abac62:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index 24a5533973..4399096299 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -1,6 +1,7 @@ /* platf.h - Public interface to the SimGrid platforms */ -/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2014. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -10,12 +11,15 @@ #include -typedef void *sg_routing_link_t; /* The actual type is model-dependent so use void* instead*/ -typedef struct s_routing_edge *sg_routing_edge_t; +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; XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name); -/** 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 */ @@ -33,13 +37,19 @@ 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, 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 */ @@ -71,6 +81,20 @@ XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const double scale, double shape); +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; +} +/** @ingroup m_datatypes_management_details + * @brief Type for any simgrid size + */ +typedef unsigned long long sg_size_t; + /* * Platform creation functions. Instead of passing 123 arguments to the creation functions * (one for each possible XML attribute), we pass structures containing them all. It removes the @@ -83,7 +107,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; @@ -182,6 +207,12 @@ typedef struct s_sg_platf_cluster_cbarg { double lat; double bb_bw; double bb_lat; + 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; e_surf_link_sharing_policy_t bb_sharing_policy; @@ -190,7 +221,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,7 +240,9 @@ typedef struct { const char* id; const char* type_id; 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} @@ -218,8 +251,10 @@ typedef struct { const char* id; const char* model; const char* content; + const char* content_type; xbt_dict_t properties; - unsigned long size; /* size in Gbytes */ + 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} @@ -232,7 +267,7 @@ typedef struct { #define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL} typedef struct { - const char* id; + const char* storageId; const char* name; } s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t; @@ -258,7 +293,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; @@ -297,6 +332,7 @@ typedef struct s_sg_platf_gpu_cbarg { #define SG_PLATF_GPU_INITIALIZER {NULL} + /* ***************************************** */ XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform @@ -320,7 +356,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 @@ -348,5 +384,6 @@ XBT_PUBLIC(void) sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_ 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); +SG_END_DECL() #endif /* SG_PLATF_H */