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
properly split init and start for IO activities
[simgrid.git]
/
src
/
s4u
/
s4u_Engine.cpp
diff --git
a/src/s4u/s4u_Engine.cpp
b/src/s4u/s4u_Engine.cpp
index
5cb1a98
..
ccdce47
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-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-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. */
/* 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. */
@@
-34,14
+34,13
@@
xbt::signal<void(void)> on_deadlock;
Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
-Engine::Engine(int* argc, char** argv)
+Engine::Engine(int* argc, char** argv)
: pimpl(new kernel::EngineImpl())
{
xbt_assert(s4u::Engine::instance_ == nullptr,
"It is currently forbidden to create more than one instance of s4u::Engine");
TRACE_global_init();
SIMIX_global_init(argc, argv);
{
xbt_assert(s4u::Engine::instance_ == nullptr,
"It is currently forbidden to create more than one instance of s4u::Engine");
TRACE_global_init();
SIMIX_global_init(argc, argv);
- pimpl = new kernel::EngineImpl();
s4u::Engine::instance_ = this;
}
s4u::Engine::instance_ = this;
}
@@
-127,7
+126,7
@@
void Engine::host_unregister(std::string name)
pimpl->hosts_.erase(name);
}
pimpl->hosts_.erase(name);
}
-/** @brief Find a
n
host from its name.
+/** @brief Find a host from its name.
*
* @throw std::invalid_argument if the searched host does not exist.
*/
*
* @throw std::invalid_argument if the searched host does not exist.
*/
@@
-138,7
+137,7
@@
simgrid::s4u::Host* Engine::host_by_name(std::string name)
return pimpl->hosts_.at(name);
}
return pimpl->hosts_.at(name);
}
-/** @brief Find a
n
host from its name (or nullptr if that host does not exist) */
+/** @brief Find a host from its name (or nullptr if that host does not exist) */
simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name)
{
auto host = pimpl->hosts_.find(name);
simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name)
{
auto host = pimpl->hosts_.find(name);