X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be5b1909ae03fa305b6aff11ef16e19de82966b5..b3b4bdef9d7135c197e0ce1965a75ac22bc6ff51:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 3ff896ba0d..ef48487cc7 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -41,7 +41,7 @@ typedef enum { typedef struct { const char* id; - xbt_dynar_t speed_peak; + xbt_dynar_t speed_per_pstate; int pstate; int core_amount; tmgr_trace_t speed_trace; @@ -100,7 +100,7 @@ typedef struct s_sg_platf_peer_cbarg { typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; typedef struct s_sg_platf_route_cbarg { - int symmetrical; + bool symmetrical; const char *src; const char *dst; sg_netcard_t gw_src; @@ -177,13 +177,6 @@ typedef struct { #define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL,0} -typedef struct { - const char* type_id; - const char* name; -} s_sg_platf_mstorage_cbarg_t, *sg_platf_mstorage_cbarg_t; - -#define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL} - typedef struct { const char* storageId; const char* name; @@ -240,14 +233,8 @@ typedef struct s_sg_platf_AS_cbarg { #define SG_PLATF_AS_INITIALIZER {NULL,0} -/** opaque structure defining a event generator for availability based on a probability distribution */ -typedef struct probabilist_event_generator *probabilist_event_generator_t; - /********** Routing **********/ -void routing_AS_begin(sg_platf_AS_cbarg_t AS); -void routing_AS_end(void); void routing_cluster_add_backbone(Link* bb); -AS_t routing_get_current(); /*** END of the parsing cruft ***/ XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform @@ -270,7 +257,6 @@ XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_route_cbarg_t bypassroute); XBT_PUBLIC(void) sg_platf_new_trace(sg_platf_trace_cbarg_t trace); 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); XBT_PUBLIC(void) sg_platf_new_mount(sg_platf_mount_cbarg_t mount);