X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..bdeb73fa38787af6728f7d01c0f6c0ae73d38b42:/src/simix/smx_environment.cpp

diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp
index 279e6eae77..d0c7d0228c 100644
--- a/src/simix/smx_environment.cpp
+++ b/src/simix/smx_environment.cpp
@@ -5,13 +5,13 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "smx_private.h"
+#include <xbt/ex.hpp>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/config.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
-                                "Logging specific to SIMIX (environment)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, "Logging specific to SIMIX (environment)");
 
 /********************************* SIMIX **************************************/
 
@@ -32,17 +32,22 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-  double start = 0, end = 0;
+  double start = 0;
+  double end = 0;
   if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
     start = xbt_os_time();
-  parse_platform_file(file);
+  try {
+    parse_platform_file(file);
+  }
+  catch (xbt_ex& e) {
+    xbt_die("Error while loading %s: %s", file, e.what());
+  }
   if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
     end = xbt_os_time();
   XBT_DEBUG("PARSE TIME: %g", (end - start));
-
 }
 
-void SIMIX_post_create_environment(void)
+void SIMIX_post_create_environment()
 {
   surf_presolve();
 }