#ifndef _SURF_SURF_H
#define _SURF_SURF_H
-#include "portable.h"
#include "xbt/swag.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
#include "xbt/misc.h"
+#include "portable.h"
SG_BEGIN_DECL()
} s_surf_model_description_t, *surf_model_description_t;
XBT_PUBLIC(void) update_model_description(s_surf_model_description_t *table,
- int table_size,
- const char* name,
- surf_model_t model
- );
+ const char* name,
+ surf_model_t model
+ );
XBT_PUBLIC(int) find_model_description(s_surf_model_description_t *table,
- int table_size,
- const char* name);
+ const char* name);
/** \brief Action structure
* \ingroup SURF_actions
int (*is_suspended) (surf_action_t action); /**< Return whether an action is suspended */
void (*set_max_duration) (surf_action_t action, double duration); /**< Set the max duration of an action*/
void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */
+ xbt_dict_t (*get_properties) (void* resource_id); /**< Return the properties dictionary */
const char *name; /**< Name of this model */
-
- xbt_dict_t (*get_properties) (void* link); /**< Return the properties dictionary */
-
} s_surf_model_public_t, *surf_model_public_t;
/** \brief Private data available on all models
*/
XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
-#define surf_cpu_model_description_size 1
/** \brief The list of all available cpu model models
* \ingroup SURF_models
*/
-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[surf_cpu_model_description_size];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
/* Network model */
const char* (*get_link_name) (const void *link);
double (*get_link_bandwidth) (const void *link);
double (*get_link_latency) (const void *link);
+ int (*link_shared) (const void *link);
} s_surf_network_model_extension_public_t,
*surf_network_model_extension_public_t;
*/
XBT_PUBLIC(void) surf_network_model_init_Reno(const char *filename);
+/** \brief Initializes the platform with the network model Reno2
+ * \ingroup SURF_models
+ * \param filename XML platform file name
+ *
+ * The problem is related to max( sum( arctan(C * Df * xi) ) ).
+ *
+ * Reference:
+ * [LOW01] S. H. Low. A duality model of TCP and queue management algorithms.
+ * IEEE/ACM Transaction on Networking, 11(4):525-536, 2003.
+ *
+ * Call this function only if you plan using surf_workstation_model_init_compound.
+ *
+ */
+XBT_PUBLIC(void) surf_network_model_init_Reno2(const char *filename);
+
/** \brief Initializes the platform with the network model Vegas
* \ingroup SURF_models
* \param filename XML platform file name
XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename);
#endif
-#if (HAVE_GTNETS)
-# define inc_GT 1
-#else
-# define inc_GT 0
-#endif
-#if (HAVE_SDP)
-# define inc_SDP 1
-#else
-# define inc_SDP 0
-#endif
-
-#define surf_network_model_description_size 4+inc_SDP+inc_GT
-
/** \brief The list of all available network model models
* \ingroup SURF_models
*/
-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[surf_network_model_description_size];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
/** \brief Workstation model extension public
* \ingroup SURF_models
const char* (*get_link_name) (const void *link); /**< Return the name of a network link */
double (*get_link_bandwidth) (const void *link); /**< Return the current bandwidth of a network link */
double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */
+ int (*link_shared) (const void *link);
} s_surf_workstation_model_extension_public_t,
*surf_workstation_model_extension_public_t;
*/
XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
-#define surf_workstation_model_description_size 4
/** \brief The list of all available workstation model models
* \ingroup SURF_models
*/
-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[surf_workstation_model_description_size];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[];
/** \brief The network links
* \ingroup SURF_models
/* Prototypes of the functions that handle the properties */
XBT_PUBLIC_DATA(xbt_dict_t) current_property_set; /* the prop set for the currently parsed element (also used in SIMIX) */
-void parse_properties(void);
-
-/* Prototypes for functions handling routing and were factorized succesfully from the models */
-void init_data(void);
-void parse_route_elem(void);
+XBT_PUBLIC_DATA(void) parse_properties(void);
/* surf parse file related (public because called from a test suite) */
XBT_PUBLIC(void) parse_platform_file(const char* file);
/* Stores the sets */
XBT_PUBLIC_DATA(xbt_dict_t) set_list;
-void parse_foreach(void);
-void parse_sets(void);
-void parse_route_multi_set_endpoints(void);
-void parse_route_multi_set_route(void);
-void parse_cluster(void);
-void parse_trace_init(void);
-void parse_trace_finalize(void);
-void parse_trace_c_connect(void);
-
-void manage_route(xbt_dict_t route_table, const char* route_name, int action, int isMultiRoute);
+XBT_PUBLIC_DATA(void) manage_route(xbt_dict_t route_table, const char* route_name, int action, int isMultiRoute);
XBT_PUBLIC_DATA(int) route_action;
/* This is used by all models when creating the routing table while parsing */
XBT_PUBLIC_DATA(xbt_dict_t) route_table;
XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table;
-XBT_PUBLIC_DATA(xbt_dict_t) route_table;
XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table;
-XBT_PUBLIC_DATA(xbt_dynar_t) route_link_list;
/* For the trace and trace:connect tag (store their content till the end of the parsing) */
XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
-double get_cpu_power(const char* power);
-void init_randomness(void);
-void add_randomness(void);
+XBT_PUBLIC_DATA(double) get_cpu_power(const char* power);
+
SG_END_DECL()
