X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8870e4a485d50ed72f249b345c8338dd6ef1b7f7..64a1f8476d9015f9d00c13cae746a6a4fec6e25e:/include/simgrid/platf.h

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index 8326dbde67..ac093a2fc8 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. */
@@ -11,11 +10,31 @@
 
 #include <xbt.h>
 
+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 */
-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);
+                                          
+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);
 
 /** Defines whether a given resource is working or not */
 typedef enum {
@@ -105,12 +124,29 @@ typedef struct s_sg_platf_cluster_cbarg {
   const char* state_trace;
 } s_sg_platf_cluster_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 {
   const char* id;
   const char* model;
   const char* content;
   xbt_dict_t properties;
-} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t;
+  unsigned long size; /* size in Gbytes */
+} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t;
+
+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
@@ -125,6 +161,9 @@ XBT_PUBLIC(void) sg_platf_new_link   (sg_platf_link_cbarg_t link);     // Add a
 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_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 */