A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill useless field 'parallel_' in context factories.
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index
401e3a7
..
24459fa
100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-1,38
+1,29
@@
-/* Copyright (c) 2016-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-201
9
. 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 "src/kernel/EngineImpl.hpp"
/* 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 "src/kernel/EngineImpl.hpp"
+#include "simgrid/Exception.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/kernel/routing/NetZoneImpl.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/kernel/routing/NetZoneImpl.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/resource/DiskImpl.hpp"
+#include "src/simix/smx_private.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/network_interface.hpp"
-
-#include <algorithm>
+#include "src/surf/xml/platf.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
-EngineImpl::EngineImpl() = default;
EngineImpl::~EngineImpl()
{
EngineImpl::~EngineImpl()
{
- /* copy all names to not modify the map while iterating over it.
- *
- * Plus, the hosts are destroyed in the lexicographic order to ensure
- * that the output is reproducible: we don't want to kill them in the
- * pointer order as it could be platform-dependent, which would break
- * the tests.
+ /* Since hosts_ is a std::map, the hosts are destroyed in the lexicographic order, which ensures that the output is
+ * reproducible.
*/
*/
- std::vector<std::string> names;
- for (auto const& kv : hosts_)
- names.push_back(kv.second->get_name());
-
- std::sort(names.begin(), names.end());
-
- for (auto const& name : names)
- hosts_.at(name)->destroy();
+ while (not hosts_.empty())
+ hosts_.begin()->second->destroy();
/* Also delete the other data */
delete netzone_root_;
/* Also delete the other data */
delete netzone_root_;
@@
-41,11
+32,42
@@
EngineImpl::~EngineImpl()
for (auto const& kv : storages_)
if (kv.second)
for (auto const& kv : storages_)
if (kv.second)
- kv.second->
getImpl()->
destroy();
+ kv.second->destroy();
for (auto const& kv : links_)
if (kv.second)
for (auto const& kv : links_)
if (kv.second)
- kv.second->get_impl()->destroy();
+ kv.second->destroy();
+}
+
+void EngineImpl::load_deployment(const std::string& file)
+{
+ sg_platf_exit();
+ sg_platf_init();
+
+ surf_parse_open(file);
+ 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 xbt::wrap_main(code, std::move(args));
+ };
}
}
+
+void EngineImpl::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+{
+ simix_global->registered_functions[name] = [code](std::vector<std::string> args) {
+ return std::bind(std::move(code), std::move(args));
+ };
}
}
+
+void EngineImpl::register_default(xbt_main_func_t code)
+{
+ simix_global->default_function = [code](std::vector<std::string> args) {
+ return xbt::wrap_main(code, std::move(args));
+ };
+}
+
+} // namespace kernel
+} // namespace simgrid