X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1d56f5033e22018df1944aba31bc90a1fe4b478..5572adcb6316b36ca4c10a9b004232f84865592a:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index c4cb422072..aa0075dabe 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. */ @@ -20,7 +19,7 @@ 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 avaibility based on a probability distribution */ +/** 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); @@ -29,13 +28,17 @@ XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, 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); - -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_uniform(double alpha, - double beta); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(double lambda); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(double lambda, - double k); + 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 { @@ -49,6 +52,12 @@ typedef enum { SURF_LINK_FATPIPE = 0 } e_surf_link_sharing_policy_t; +typedef enum { + SURF_LINK_DIRECTION_NONE = 2, + SURF_LINK_DIRECTION_UP = 1, + SURF_LINK_DIRECTION_DOWN = 0 +} e_surf_link_ctn_direction_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 @@ -71,6 +80,13 @@ 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; @@ -103,7 +119,7 @@ typedef struct s_sg_platf_peer_cbarg { 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; + e_surf_link_ctn_direction_t direction; } s_sg_platf_linkctn_cbarg_t; typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t; @@ -125,9 +141,21 @@ typedef struct s_sg_platf_cluster_cbarg { 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; typedef struct { @@ -135,6 +163,7 @@ typedef struct { 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; typedef struct { @@ -151,14 +180,17 @@ typedef struct { 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, const char *mode); // Begin description of new AS +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_linkctn (sg_platf_linkctn_cbarg_t linkctn); // Add a linkctn 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);