X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92a1a3afd9e836da4c7cec7022097b7956c6d749..5a00c16b5ea7fd8c37f39544914acfcb0f6e07b2:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index a35a9923e4..840cd70383 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -266,12 +266,25 @@ XBT_PUBLIC_DATA(surf_network_resource_t) surf_network_resource;
  *  \param filename XML platform file name
  *
  *  This function is called by surf_workstation_resource_init_CLM03
- *  so you shouldn't call it by yourself.
+ *  or by yourself only if you plan using surf_workstation_resource_init_compound
  *
  *  \see surf_workstation_resource_init_CLM03()
  */
 XBT_PUBLIC(void) surf_network_resource_init_CM02(const char *filename);
 
+#ifdef USE_GTNETS
+/** \brief Initializes the platform with the network model GTNETS
+ *  \ingroup SURF_resources
+ *  \param filename XML platform file name
+ *
+ *  This function is called by surf_workstation_resource_init_GTNETS
+ *  or by yourself only if you plan using surf_workstation_resource_init_compound
+ *
+ *  \see surf_workstation_resource_init_GTNETS()
+ */
+XBT_PUBLIC(void) surf_network_resource_init_GTNETS(const char *filename);
+#endif
+
 /** \brief Workstation resource extension public
  *  \ingroup SURF_resources
  *
@@ -321,6 +334,16 @@ typedef struct surf_workstation_resource {
  */
 XBT_PUBLIC_DATA(surf_workstation_resource_t) surf_workstation_resource;
 
+/** \brief Initializes the platform with a compound workstation model
+ *  \ingroup SURF_resources
+ *  \param filename XML platform file name
+ *
+ *  This function should be called after a cpu_resource and a
+ *  network_resource have been set up.
+ *
+ */
+XBT_PUBLIC(void) surf_workstation_resource_init_compound(const char *filename);
+
 /** \brief Initializes the platform with the workstation model CLM03
  *  \ingroup SURF_resources
  *  \param filename XML platform file name
@@ -367,7 +390,7 @@ XBT_PUBLIC(void) surf_workstation_resource_init_KCCFLN05(const char *filename);
  *
  *  \see surf_workstation_resource_init_CLM03()
  */
-XBT_PUBLIC(void) surf_workstation_resource_init_KCCFLN05_proportionnal(const char *filename);
+XBT_PUBLIC(void) surf_workstation_resource_init_KCCFLN05_proportional(const char *filename);
 
 /** \brief Initializes the platform with the model KCCFLN05 using a lagrange
  *  optimization approach to compute the effectivet bandwidth of each flow based