* 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 **************************************/
*/
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();
- TRY {
+ try {
parse_platform_file(file);
- } CATCH (e) {
- xbt_die("Error while loading %s: %s", file, e.msg);
+ }
+ 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();
}