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
Further rename the identifiers of flexml to simgrid_parse_*
[simgrid.git]
/
src
/
kernel
/
EngineImpl.cpp
diff --git
a/src/kernel/EngineImpl.cpp
b/src/kernel/EngineImpl.cpp
index
0d1c7fe
..
3e170be
100644
(file)
--- a/
src/kernel/EngineImpl.cpp
+++ b/
src/kernel/EngineImpl.cpp
@@
-99,7
+99,7
@@
static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
"If you think you've found a bug in SimGrid, please report it along with a\n"
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
"If you think you've found a bug in SimGrid, please report it along with a\n"
"Minimal Working Example (MWE) reproducing your problem and a full backtrace\n"
"of the fault captured with gdb or valgrind.\n",
- simgrid::kernel::context::stack_size / 1024);
+ simgrid::kernel::context::
Context::
stack_size / 1024);
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
} else if (siginfo->si_signo == SIGSEGV) {
fprintf(stderr, "Segmentation fault.\n");
#if HAVE_SMPI
@@
-115,12
+115,13
@@
static void segvhandler(int signum, siginfo_t* siginfo, void* /*context*/)
std::raise(signum);
}
std::raise(signum);
}
-/**
- * Install signal handler for SIGSEGV.
- */
-static void install_segvhandler()
+static void install_signal_handlers()
{
{
- if (simgrid::kernel::context::Context::install_sigsegv_stack(nullptr, true) == -1) {
+ /* Install signal handler for SIGINT */
+ std::signal(SIGINT, inthandler);
+
+ /* Install signal handler for SIGSEGV */
+ if (simgrid::kernel::context::Context::install_sigsegv_stack(true) == -1) {
XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno));
return;
}
XBT_WARN("Failed to register alternate signal stack: %s", strerror(errno));
return;
}
@@
-181,12
+182,9
@@
void EngineImpl::initialize(int* argc, char** argv)
instance_->context_mod_init();
instance_->context_mod_init();
- /* Prepare to display some more info when dying on Ctrl-C pressing */
- std::signal(SIGINT, inthandler);
- install_segvhandler();
+ install_signal_handlers();
/* register a function to be called by SURF after the environment creation */
/* register a function to be called by SURF after the environment creation */
- sg_platf_init();
s4u::Engine::on_platform_created_cb([this]() { this->presolve(); });
if (config::get_value<bool>("debug/clean-atexit"))
s4u::Engine::on_platform_created_cb([this]() { this->presolve(); });
if (config::get_value<bool>("debug/clean-atexit"))
@@
-273,7
+271,7
@@
void EngineImpl::shutdown()
}
tmgr_finalize();
}
tmgr_finalize();
- sg_platf_
exit
();
+ sg_platf_
parser_finalize
();
delete instance_;
instance_ = nullptr;
delete instance_;
instance_ = nullptr;
@@
-313,12
+311,11
@@
void EngineImpl::load_platform(const std::string& platf)
void EngineImpl::load_deployment(const std::string& file) const
{
void EngineImpl::load_deployment(const std::string& file) const
{
- sg_platf_exit();
- sg_platf_init();
+ sg_platf_parser_finalize();
- s
urf
_parse_open(file);
- s
urf
_parse();
- s
urf
_parse_close();
+ s
imgrid
_parse_open(file);
+ s
imgrid
_parse();
+ s
imgrid
_parse_close();
}
void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)
}
void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)