X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04c10dad7fa6089786021b0f8b4413f86bafd6fd..2c5c14ffd2b2af540f201434bd4d32f9c197507f:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index 3837ac9ad9..e517a94795 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -1,7 +1,6 @@ /* platf.h - Public interface to the SimGrid platforms */ -/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010, 2011. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2012. 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. */ @@ -9,16 +8,49 @@ #ifndef SG_PLATF_H #define SG_PLATF_H -#include /* our toolbox */ +#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; + +XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name); + + 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; + +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, + double periodicity); +XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_generator(const char *id, + probabilist_event_generator_t generator1, + probabilist_event_generator_t generator2, + int is_state_trace); + +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_uniform(const char* id, + double min, + double max); +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(const char* id, + double rate); +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const char* id, + double scale, + double shape); + /** Defines whether a given resource is working or not */ typedef enum { SURF_RESOURCE_ON = 1, /**< Up & ready */ SURF_RESOURCE_OFF = 0 /**< Down & broken */ } e_surf_resource_state_t; +typedef enum { + SURF_LINK_FULLDUPLEX = 2, + SURF_LINK_SHARED = 1, + SURF_LINK_FATPIPE = 0 +} e_surf_link_sharing_policy_t; /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -42,34 +74,120 @@ typedef struct { xbt_dict_t properties; } s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t; +typedef struct { + const char* id; + const char* link_up; + const char* link_down; +} s_sg_platf_host_link_cbarg_t, *sg_platf_host_link_cbarg_t; + + typedef struct { const char* id; const char* coord; } s_sg_platf_router_cbarg_t, *sg_platf_router_cbarg_t; typedef struct { - const char* V_link_id; - double V_link_bandwidth; - tmgr_trace_t V_link_bandwidth_file; - double V_link_latency; - tmgr_trace_t V_link_latency_file; - e_surf_resource_state_t V_link_state; - tmgr_trace_t V_link_state_file; - int V_link_sharing_policy; - int V_policy_initial_link; + const char* id; + double bandwidth; + tmgr_trace_t bandwidth_trace; + double latency; + tmgr_trace_t latency_trace; + e_surf_resource_state_t state; + tmgr_trace_t state_trace; + e_surf_link_sharing_policy_t policy; xbt_dict_t properties; } s_sg_platf_link_cbarg_t, *sg_platf_link_cbarg_t; +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 bw_in; + double bw_out; + double lat; + const char* coord; + tmgr_trace_t availability_trace; + tmgr_trace_t state_trace; +} s_sg_platf_peer_cbarg_t; + +typedef struct s_sg_platf_linkctn_cbarg *sg_platf_linkctn_cbarg_t; +typedef struct s_sg_platf_linkctn_cbarg { + const char *id; + const char *direction; +} s_sg_platf_linkctn_cbarg_t; -XBT_PUBLIC(void) sg_platf_open(void); // Start a new platform -XBT_PUBLIC(void) sg_platf_close(void); // Finish the creation of the platform +typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t; +typedef struct s_sg_platf_cluster_cbarg { + const char* id; + const char* prefix; + const char* suffix; + const char* radical; + double power; + int core_amount; + double bw; + double lat; + double bb_bw; + double bb_lat; + const char* router_id; + e_surf_link_sharing_policy_t sharing_policy; + e_surf_link_sharing_policy_t bb_sharing_policy; + const char* availability_trace; //don't convert to tmgr_trace_t since there is a trace per host and some rewriting is needed + const char* state_trace; +} s_sg_platf_cluster_cbarg_t; + +typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t; +typedef struct s_sg_platf_cabinet_cbarg { + const char* id; + const char* prefix; + const char* suffix; + const char* radical; + double power; + double bw; + double lat; +} s_sg_platf_cabinet_cbarg_t; + +typedef struct { + const char* id; + const char* type_id; + const char* content; +} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t; -XBT_PUBLIC(void) sg_platf_new_AS_open(const char *id, const char *mode); // Begin description of new AS -XBT_PUBLIC(void) sg_platf_new_AS_close(void); // That AS is fully described +typedef struct { + const char* id; + const char* model; + const char* content; + xbt_dict_t properties; + unsigned long size; /* size in Gbytes */ +} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t; -XBT_PUBLIC(void) sg_platf_new_host (sg_platf_host_cbarg_t host); // Add an host to the currently described AS -XBT_PUBLIC(void) sg_platf_new_router(sg_platf_router_cbarg_t router); // Add a router to the currently described AS -XBT_PUBLIC(void) sg_platf_new_link (sg_platf_link_cbarg_t link); // Add a link to the currently described AS +typedef struct { + const char* type_id; + const char* name; +} s_sg_platf_mstorage_cbarg_t, *sg_platf_mstorage_cbarg_t; +typedef struct { + const char* id; + const char* name; +} s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t; + + +XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform +XBT_PUBLIC(void) sg_platf_end(void); // Finish the creation of the platform + +XBT_PUBLIC(void) sg_platf_new_AS_begin(const char *id, int mode); // Begin description of new AS +XBT_PUBLIC(void) sg_platf_new_AS_end(void); // That AS is fully described + +XBT_PUBLIC(void) sg_platf_new_host (sg_platf_host_cbarg_t host); // Add an host to the currently described AS +XBT_PUBLIC(void) sg_platf_new_host_link(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS +XBT_PUBLIC(void) sg_platf_new_router (sg_platf_router_cbarg_t router); // Add a router to the currently described AS +XBT_PUBLIC(void) sg_platf_new_link (sg_platf_link_cbarg_t link); // Add a link to the currently described AS +XBT_PUBLIC(void) sg_platf_new_peer (sg_platf_peer_cbarg_t peer); // Add a peer to the currently described AS +XBT_PUBLIC(void) sg_platf_new_cluster(sg_platf_cluster_cbarg_t clust); // Add a cluster to the currently described AS +XBT_PUBLIC(void) sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet); // Add a cabinet 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_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); #endif /* SG_PLATF_H */