X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a251a46feac3eac126243e066a947e153464a29e..d7fe15f62820f53f48d0f894212373fac36e449b:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index f401c3617e..8b83c0adac 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -12,7 +12,6 @@
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 #include "xbt/misc.h"
-#include "portable.h"
 
 SG_BEGIN_DECL()
 
@@ -245,11 +244,11 @@ XBT_PUBLIC_DATA(surf_cpu_model_t) surf_cpu_model;
  */
 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 */
 
@@ -290,6 +289,21 @@ XBT_PUBLIC(void) create_workstations(void);
  */
 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
@@ -355,7 +369,7 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename);
  *
  *  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.
  *
@@ -364,13 +378,17 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename);
 XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename);
 #endif
 
-
-
-XBT_PUBLIC_DATA(int) surf_network_model_description_size;
+#if defined(HAVE_GTNETS) && defined(HAVE_SDP)
+# define surf_network_model_description_size  6
+#elsif defined(HAVE_GTNETS) || defined(HAVE_SDP)
+# define surf_network_model_description_size  5
+#else 
+# define surf_network_model_description_size  4
+#endif   
 /** \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
@@ -470,11 +488,11 @@ XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char *filename);
  */
 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
@@ -556,8 +574,8 @@ void free_string(void*);
 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;
@@ -581,9 +599,14 @@ 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 */
+/* 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);