X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/266c603229beb53e39c935be162065bb8280da48..85a77905309ea08dc52e42f1f897bdcd1a745bb6:/src/kernel/EngineImpl.cpp

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index ab8ce33de0..28f993c4b7 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 {
@@ -47,29 +45,17 @@ void EngineImpl::load_deployment(const std::string& file)
   sg_platf_init();
 
   surf_parse_open(file);
-  int parse_status = surf_parse();
+  surf_parse();
   surf_parse_close();
-  surf_parse_assert(not parse_status, std::string("Parse error in file ") + file);
-}
-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));
-  };
 }
 
-void EngineImpl::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)
 {
-  simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
-    return std::bind(std::move(code), std::move(args));
-  };
+  registered_functions[name] = code;
 }
-
-void EngineImpl::register_default(xbt_main_func_t code)
+void EngineImpl::register_default(const actor::ActorCodeFactory& code)
 {
-  simix_global->default_function = [code](std::vector<std::string> args) {
-    return simgrid::xbt::wrap_main(code, std::move(args));
-  };
+  default_function = code;
 }
 
 } // namespace kernel