X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bded17ddf45f0643fd7f137d0acecdee853ea7d1..8e7feffef5e41a487cc322c68265c09cc0d7bdf2:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 9a44225168..07e5ab61e5 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2020. 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. */
@@ -12,9 +12,7 @@
 #include "src/simix/smx_private.hpp"
 #include "src/surf/StorageImpl.hpp"
 #include "src/surf/network_interface.hpp"
-#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
-
-extern int surf_parse_lineno;
+#include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
 namespace simgrid {
 namespace kernel {
@@ -34,11 +32,11 @@ EngineImpl::~EngineImpl()
 
   for (auto const& kv : storages_)
     if (kv.second)
-      kv.second->get_impl()->destroy();
+      kv.second->destroy();
 
   for (auto const& kv : links_)
     if (kv.second)
-      kv.second->get_impl()->destroy();
+      kv.second->destroy();
 }
 
 void EngineImpl::load_deployment(const std::string& file)
@@ -47,21 +45,13 @@ void EngineImpl::load_deployment(const std::string& file)
   sg_platf_init();
 
   surf_parse_open(file);
-  try {
-    int parse_status = surf_parse();
-    surf_parse_close();
-    xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
-  } catch (const Exception&) {
-    xbt_die(
-        "Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
-        file.c_str(), surf_parse_lineno);
-    throw;
-  }
+  surf_parse();
+  surf_parse_close();
 }
 void EngineImpl::register_function(const std::string& name, xbt_main_func_t code)
 {
   simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
-    return simgrid::xbt::wrap_main(code, std::move(args));
+    return xbt::wrap_main(code, std::move(args));
   };
 }
 
@@ -75,7 +65,7 @@ void EngineImpl::register_function(const std::string& name, void (*code)(std::ve
 void EngineImpl::register_default(xbt_main_func_t code)
 {
   simix_global->default_function = [code](std::vector<std::string> args) {
-    return simgrid::xbt::wrap_main(code, std::move(args));
+    return xbt::wrap_main(code, std::move(args));
   };
 }