/* 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. */
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);
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 {
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 {
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