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
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
4c53ae6
..
10547b1
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-144,12
+144,6
@@
double SIMIX_timer_next()
return simix_timers.empty() ? -1.0 : simix_timers.top().first;
}
return simix_timers.empty() ? -1.0 : simix_timers.top().first;
}
-static void kill_process(smx_actor_t process)
-{
- SIMIX_process_kill(process, nullptr);
-}
-
-
namespace simgrid {
namespace simix {
namespace simgrid {
namespace simix {
@@
-179,7
+173,7
@@
void SIMIX_global_init(int *argc, char **argv)
simgrid::mc::Client::initialize();
#endif
simgrid::mc::Client::initialize();
#endif
- if (
not simix_global
) {
+ if (
simix_global == nullptr
) {
simix_global = std::unique_ptr<simgrid::simix::Global>(new simgrid::simix::Global());
simix_global->maestro_process = nullptr;
simix_global = std::unique_ptr<simgrid::simix::Global>(new simgrid::simix::Global());
simix_global->maestro_process = nullptr;
@@
-198,7
+192,7
@@
void SIMIX_global_init(int *argc, char **argv)
#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
#endif
/* register a function to be called by SURF after the environment creation */
sg_platf_init();
- simgrid::s4u::on_platform_created.connect(
SIMIX_post_create_environment
);
+ simgrid::s4u::on_platform_created.connect(
surf_presolve
);
simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) {
sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_cname());
simgrid::s4u::Storage::on_creation.connect([](simgrid::s4u::Storage& storage) {
sg_storage_t s = simgrid::s4u::Storage::by_name(storage.get_cname());