#ifndef _SURF_SURF_H
#define _SURF_SURF_H
+#include "portable.h"
#include "xbt/swag.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
*/
XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
-XBT_PUBLIC_DATA(int) surf_cpu_model_description_size;
+#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[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[surf_cpu_model_description_size];
/* Network model */
*/
XBT_PUBLIC_DATA(surf_network_model_t) surf_network_model;
+
+/** \brief Initializes the platform with the network model 'Constant'
+ * \ingroup SURF_models
+ * \param filename XML platform file name
+ *
+ * In this model, the communication time between two network cards is
+ * constant, hence no need for a routing table. This is particularly
+ * usefull when simulating huge distributed algorithms where
+ * scalability is really an issue. This function is called in
+ * conjunction with surf_workstation_model_init_compound.
+ *
+ * \see surf_workstation_model_init_compound()
+ */
+XBT_PUBLIC(void) surf_network_model_init_Constant(const char *filename);
+
/** \brief Initializes the platform with the network model CM02
* \ingroup SURF_models
* \param filename XML platform file name
*/
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
*
* Reference:
*
- * [TAG03]. Corinne Touati, Eitan Altman, and Jérôme Galtier.
+ * [TAG03]. Corinne Touati, Eitan Altman, and Jerome Galtier.
* Semi-definite programming approach for bandwidth allocation and routing in networks.
* Game Theory and Applications, 9:169-179, December 2003. Nova publisher.
*
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
-XBT_PUBLIC_DATA(int) surf_network_model_description_size;
/** \brief The list of all available network model models
* \ingroup SURF_models
*/
-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[surf_network_model_description_size];
/** \brief Workstation model extension public
* \ingroup SURF_models
*/
XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
-XBT_PUBLIC_DATA(int) surf_workstation_model_description_size;
+#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[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[surf_workstation_model_description_size];
/** \brief The network links
* \ingroup SURF_models
*/
XBT_PUBLIC(void) surf_init(int *argc, char **argv); /* initialize common structures */
+/** \brief Finish simulation initialization
+ * \ingroup SURF_simulation
+ *
+ * This function must be called before the first call to surf_solve()
+ */
+XBT_PUBLIC(void) surf_presolve(void);
+
/** \brief Performs a part of the simulation
* \ingroup SURF_simulation
* \return the elapsed time, or -1.0 if no event could be executed
/* 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);
-void free_string(void*);
/* Prototypes for functions handling routing and were factorized succesfully from the models */
void init_data(void);
void parse_route_elem(void);
-/* surf parse file related */
-void parse_platform_file(const char* file);
+/* 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;
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 */
+/* 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_dynar_t) traces_connect_list;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
+
double get_cpu_power(const char* power);
void init_randomness(void);
