X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7bbc27a9c71861263b01883617b2828e974bb68..8fb370cb7b0fe8f6edcec683a27ffe6e58cb3056:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index fb46ea8f13..99b92f5494 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. */ @@ -19,10 +18,27 @@ 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 */ -XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new(const char *filename); + +/** 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 { @@ -36,6 +52,19 @@ typedef enum { SURF_LINK_FATPIPE = 0 } e_surf_link_sharing_policy_t; +typedef enum { + SURF_TRACE_CONNECT_KIND_HOST_AVAIL = 4, + SURF_TRACE_CONNECT_KIND_POWER = 3, + 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; + +typedef enum { + SURF_PROCESS_ON_FAILURE_DIE = 1, + SURF_PROCESS_ON_FAILURE_RESTART = 0 +} e_surf_process_on_failure_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 @@ -58,6 +87,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; @@ -87,11 +123,39 @@ typedef struct s_sg_platf_peer_cbarg { 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; +typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; +typedef struct s_sg_platf_route_cbarg { + int symmetrical; + const char *src; + const char *dst; + xbt_dynar_t link_list; +} s_sg_platf_route_cbarg_t; + +typedef struct s_sg_platf_ASroute_cbarg *sg_platf_ASroute_cbarg_t; +typedef struct s_sg_platf_ASroute_cbarg { + int symmetrical; + const char *src; + const char *dst; + const char *gw_src; + const char *gw_dst; + xbt_dynar_t link_list; +} s_sg_platf_ASroute_cbarg_t; + +typedef struct s_sg_platf_bypassRoute_cbarg *sg_platf_bypassRoute_cbarg_t; +typedef struct s_sg_platf_bypassRoute_cbarg { + const char *src; + const char *dst; + xbt_dynar_t link_list; +} s_sg_platf_bypassRoute_cbarg_t; + +typedef struct s_sg_platf_bypassASroute_cbarg *sg_platf_bypassASroute_cbarg_t; +typedef struct s_sg_platf_bypassASroute_cbarg { + const char *src; + const char *dst; + const char *gw_src; + const char *gw_dst; + xbt_dynar_t link_list; +} s_sg_platf_bypassASroute_cbarg_t; typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t; typedef struct s_sg_platf_cluster_cbarg { @@ -112,9 +176,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 { @@ -122,6 +198,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 { @@ -134,22 +211,68 @@ typedef struct { const char* name; } s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t; +typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t; +typedef struct s_sg_platf_prop_cbarg { + const char *id; + const char *value; +} s_sg_platf_prop_cbarg_t; + +typedef struct s_sg_platf_trace_cbarg *sg_platf_trace_cbarg_t; +typedef struct s_sg_platf_trace_cbarg { + const char *id; + const char *file; + double periodicity; + const char *pc_data; +} s_sg_platf_trace_cbarg_t; + +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; + const char *trace; + const char *element; +} s_sg_platf_trace_connect_cbarg_t; + +typedef struct s_sg_platf_process_cbarg *sg_platf_process_cbarg_t; +typedef struct s_sg_platf_process_cbarg { + const char **argv; + int argc; + xbt_dict_t properties; + const char *host; + const char *function; + double start_time; + double kill_time; + e_surf_process_on_failure_t on_failure; +} s_sg_platf_process_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, 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_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_route (sg_platf_route_cbarg_t route); // Add a route +XBT_PUBLIC(void) sg_platf_new_ASroute (sg_platf_ASroute_cbarg_t ASroute); // Add an ASroute +XBT_PUBLIC(void) sg_platf_new_bypassRoute (sg_platf_bypassRoute_cbarg_t bypassroute); // Add a bypassRoute +XBT_PUBLIC(void) sg_platf_new_bypassASroute (sg_platf_bypassASroute_cbarg_t bypassASroute); // Add an bypassASroute +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_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); +XBT_PUBLIC(void) sg_platf_new_process(sg_platf_process_cbarg_t process); + #endif /* SG_PLATF_H */