Probabilist trace generator : variable names changed

[simgrid.git] / include / simgrid / platf.h

diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h
index a08e6a6..ec41a07 100644 (file)
--- 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 min,
+                                                                           double max);
+XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(double rate);
+XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(double scale,
+                                                                           double shape);
 
 /** Defines whether a given resource is working or not */
 typedef enum {
@@ -108,6 +127,7 @@ typedef struct s_sg_platf_cluster_cbarg {
 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 {
@@ -115,6 +135,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 {