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
deprecate Engine::shutdown()
[simgrid.git]
/
src
/
s4u
/
s4u_Engine.cpp
diff --git
a/src/s4u/s4u_Engine.cpp
b/src/s4u/s4u_Engine.cpp
index
0d1c8f8
..
5fc537a
100644
(file)
--- a/
src/s4u/s4u_Engine.cpp
+++ b/
src/s4u/s4u_Engine.cpp
@@
-1,6
+1,6
@@
/* s4u::Engine Simulation Engine and global functions. */
/* s4u::Engine Simulation Engine and global functions. */
-/* Copyright (c) 2006-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-202
2
. 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. */
/* 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. */
@@
-64,7
+64,9
@@
Engine::~Engine()
/** @brief Retrieve the engine singleton */
Engine* Engine::get_instance()
{
/** @brief Retrieve the engine singleton */
Engine* Engine::get_instance()
{
- return get_instance(nullptr, nullptr);
+ int argc = 0;
+ char* argv = nullptr;
+ return get_instance(&argc, &argv);
}
Engine* Engine::get_instance(int* argc, char** argv)
{
}
Engine* Engine::get_instance(int* argc, char** argv)
{
@@
-75,7
+77,7
@@
Engine* Engine::get_instance(int* argc, char** argv)
return Engine::instance_;
}
return Engine::instance_;
}
-void Engine::shutdown()
+void Engine::shutdown()
// XBT_ATTRIB_DEPRECATED_v335
{
delete Engine::instance_;
}
{
delete Engine::instance_;
}
@@
-112,6
+114,16
@@
void Engine::load_platform(const std::string& platf) const
pimpl->load_platform(platf);
}
pimpl->load_platform(platf);
}
+/**
+ * @brief Seals the platform, finishing the creation of its resources.
+ *
+ * This method is optional. The seal() is done automatically when you call Engine::run.
+ */
+void Engine::seal_platform() const
+{
+ pimpl->seal_platform();
+}
+
/** Registers the main function of an actor that will be launched from the deployment file */
void Engine::register_function(const std::string& name, const std::function<void(int, char**)>& code)
{
/** Registers the main function of an actor that will be launched from the deployment file */
void Engine::register_function(const std::string& name, const std::function<void(int, char**)>& code)
{
@@
-321,12
+333,6
@@
void Engine::run() const
}
void Engine::run_until(double max_date) const
{
}
void Engine::run_until(double max_date) const
{
- /* sealing resources before run: links */
- for (auto* link : get_all_links())
- link->seal();
- /* seal netzone root, recursively seal children netzones, hosts and disks */
- get_netzone_root()->seal();
-
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);