[simix] Use std::string for s_smx_process_arg

[simgrid.git] / src / simix / smx_environment.cpp

diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp
index 9b4c6db..3d82fd9 100644 (file)
--- a/src/simix/smx_environment.cpp
+++ b/src/simix/smx_environment.cpp
@@ -9,7 +9,6 @@
 #include "xbt/log.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/config.h"
-#include "surf/surfxml_parse.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                 "Logging specific to SIMIX (environment)");
@@ -33,10 +32,15 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
+  xbt_ex_t e;
   double start = 0, 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 (e) {
+    xbt_die("Error while loading %s: %s", file, e.msg);
+  }
   if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
     end = xbt_os_time();
   XBT_DEBUG("PARSE TIME: %g", (end - start));