Make sure the navbar tricks we use in the post-processor don't land in the short...

[simgrid.git] / src / msg / environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 31aa28979eb3440ecfd3a1029fa83e47172b741b..fbc75cedb026254185495eb5b073fe975c71762c 100644 (file)
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -5,10 +5,11 @@
 /* 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. */
 
-#include"private.h"
-#include"xbt/sysdep.h"
-#include "xbt/error.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "gras_config.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_environment, msg,
                                "Logging specific to MSG (environment)");
 
 /** \defgroup msg_easier_life      Platform and Application management
@@ -16,6 +17,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
  *  and the application deployment. You should also have a look at 
  *  \ref MSG_examples  to have an overview of their usage.
  */
+/** @addtogroup msg_easier_life
+ *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Platforms and Applications" --> \endhtmlonly
+ * 
+ */
 
 /********************************* MSG **************************************/
 
@@ -66,13 +71,19 @@ void MSG_create_environment(const char *file) {
   surf_timer_resource_init(file);
 
   /* which model do you want today? */
-  xbt_cfg_get_string (_msg_cfg_set, "surf_workstation_model",
-                     &workstation_model_name);
+  workstation_model_name = xbt_cfg_get_string (_msg_cfg_set, "surf_workstation_model");
+
   DEBUG1("Model : %s", workstation_model_name);
   if (!strcmp(workstation_model_name,"KCCFLN05")) {
     surf_workstation_resource_init_KCCFLN05(file);
+  }else if (!strcmp(workstation_model_name,"KCCFLN05_proportional")) {
+    surf_workstation_resource_init_KCCFLN05_proportionnal(file);
   } else if (!strcmp(workstation_model_name,"CLM03")) {
     surf_workstation_resource_init_CLM03(file);
+#ifdef USE_GTNETS
+  } else if (!strcmp(workstation_model_name,"GTNETS")) {
+    surf_workstation_resource_init_GTNETS(file);
+#endif
   } else {
     xbt_assert0(0,"The impossible happened (once again)");
   }