-/* Copyright (c) 2007-2015. The SimGrid Team.
+/* Copyright (c) 2007-2018. The SimGrid Team.
* All rights reserved. */
/* 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 "smx_private.h"
-#include "xbt/sysdep.h"
+#include "smx_private.hpp"
+#include "xbt/config.hpp"
#include "xbt/log.h"
+#include "xbt/sysdep.h"
#include "xbt/xbt_os_time.h"
-#include "xbt/config.h"
-#include "surf/surfxml_parse.h"
+#include <xbt/ex.hpp>
-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 **************************************/
*/
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();
}