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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index
075d7ff
..
ff519e4
100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-8,18
+8,19
@@
#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 <simgrid/sg_config.hpp>
-#include "mc/mc.h"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "src/kernel/resource/profile/Profile.hpp"
+#include "src/kernel/xml/platf.hpp"
+#include "src/mc/mc.h"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.hpp"
+#include "src/simgrid/math_utils.h"
+#include "src/simgrid/sg_config.hpp"
#include "src/smpi/include/smpi_actor.hpp"
#include "src/smpi/include/smpi_actor.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "xbt/module.h"
-#include "xbt/xbt_modinter.h" /* whether initialization was already done */
+
+#include "xbt/log.hpp"
#include <boost/algorithm/string/predicate.hpp>
#include <dlfcn.h>
#include <boost/algorithm/string/predicate.hpp>
#include <dlfcn.h>
@@
-138,6
+139,9
@@
static void install_signal_handlers()
}
}
}
}
+static simgrid::config::Flag<bool> cfg_dbg_clean_atexit{
+ "debug/clean-atexit", "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.", true};
+
namespace simgrid::kernel {
EngineImpl::~EngineImpl()
namespace simgrid::kernel {
EngineImpl::~EngineImpl()
@@
-174,8
+178,14
@@
void EngineImpl::initialize(int* argc, char** argv)
simgrid::mc::AppSide::initialize();
#endif
simgrid::mc::AppSide::initialize();
#endif
- if (xbt_initialized == 0) {
- xbt_init(argc, argv);
+ if (static bool inited = false; not inited) {
+ inited = true;
+ xbt_log_init(argc, argv);
+
+ simgrid::xbt::install_exception_handler();
+
+ for (int i = 0; i < *argc; i++)
+ cmdline_.emplace_back(argv[i]);
sg_config_init(argc, argv);
}
sg_config_init(argc, argv);
}
@@
-184,10
+194,10
@@
void EngineImpl::initialize(int* argc, char** argv)
install_signal_handlers();
install_signal_handlers();
- /* register a function to be called
by SURF
after the environment creation */
+ /* register a function to be called after the environment creation */
s4u::Engine::on_platform_created_cb([this]() { this->presolve(); });
s4u::Engine::on_platform_created_cb([this]() { this->presolve(); });
- if (c
onfig::get_value<bool>("debug/clean-atexit")
)
+ if (c
fg_dbg_clean_atexit
)
atexit(shutdown);
}
atexit(shutdown);
}
@@
-341,7
+351,7
@@
void EngineImpl::add_model(std::shared_ptr<resource::Model> model, const std::ve
models_prio_[model_name] = std::move(model);
}
models_prio_[model_name] = std::move(model);
}
-/** Wake up all actors waiting for a
Surf
action to finish */
+/** Wake up all actors waiting for a
n
action to finish */
void EngineImpl::handle_ended_actions() const
{
for (auto const& model : models_) {
void EngineImpl::handle_ended_actions() const
{
for (auto const& model : models_) {
@@
-353,7
+363,7
@@
void EngineImpl::handle_ended_actions() const
if (action->get_activity()->get_actor() == maestro_)
action->get_activity()->get_iface()->complete(s4u::Activity::State::FAILED);
if (action->get_activity()->get_actor() == maestro_)
action->get_activity()->get_iface()->complete(s4u::Activity::State::FAILED);
- activity::ActivityImplPtr(action->get_activity())->
post
();
+ activity::ActivityImplPtr(action->get_activity())->
finish
();
}
}
XBT_DEBUG("Handling the terminated actions (if any)");
}
}
XBT_DEBUG("Handling the terminated actions (if any)");
@@
-366,7
+376,7
@@
void EngineImpl::handle_ended_actions() const
if (action->get_activity()->get_actor() == maestro_)
action->get_activity()->get_iface()->complete(s4u::Activity::State::FINISHED);
if (action->get_activity()->get_actor() == maestro_)
action->get_activity()->get_iface()->complete(s4u::Activity::State::FINISHED);
- activity::ActivityImplPtr(action->get_activity())->
post
();
+ activity::ActivityImplPtr(action->get_activity())->
finish
();
}
}
}
}
}
}
@@
-551,7
+561,7
@@
double EngineImpl::solve(double max_date) const
while (auto* event = profile::future_evt_set.pop_leq(next_event_date, &value, &resource)) {
if(value<0)
continue;
while (auto* event = profile::future_evt_set.pop_leq(next_event_date, &value, &resource)) {
if(value<0)
continue;
- if (resource->is_used()
|| (watched_hosts().find(resource->get_cname()) != watched_hosts().end())
) {
+ if (resource->is_used()) {
time_delta = next_event_date - now_;
XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f",
time_delta);
time_delta = next_event_date - now_;
XBT_DEBUG("This event invalidates the next_occurring_event() computation of models. Next event set to %f",
time_delta);