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
Pointer-to-const for Sonar.
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
bf12e24
..
4bc14b5
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-166,7
+166,6
@@
void SIMIX_global_init(int* argc, char** argv)
surf_init(argc, argv); /* Initialize SURF structures */
surf_init(argc, argv); /* Initialize SURF structures */
- simix_global->maestro_ = nullptr;
SIMIX_context_mod_init();
// Either create a new context with maestro or create
SIMIX_context_mod_init();
// Either create a new context with maestro or create
@@
-202,7
+201,7
@@
void SIMIX_clean()
smx_cleaned = true;
XBT_DEBUG("SIMIX_clean called. Simulation's over.");
auto* engine = simgrid::kernel::EngineImpl::get_instance();
smx_cleaned = true;
XBT_DEBUG("SIMIX_clean called. Simulation's over.");
auto* engine = simgrid::kernel::EngineImpl::get_instance();
- if (engine->has_actors_to_run() &&
SIMIX_
get_clock() <= 0.0) {
+ if (engine->has_actors_to_run() &&
simgrid::s4u::Engine::
get_clock() <= 0.0) {
XBT_CRITICAL(" ");
XBT_CRITICAL("The time is still 0, and you still have processes ready to run.");
XBT_CRITICAL("It seems that you forgot to run the simulation that you setup.");
XBT_CRITICAL(" ");
XBT_CRITICAL("The time is still 0, and you still have processes ready to run.");
XBT_CRITICAL("It seems that you forgot to run the simulation that you setup.");
@@
-221,13
+220,12
@@
void SIMIX_clean()
#endif
/* Kill all processes (but maestro) */
#endif
/* Kill all processes (but maestro) */
- simix_global->
maestro_
->kill_all();
+ simix_global->
get_maestro()
->kill_all();
engine->run_all_actors();
engine->empty_trash();
/* Let's free maestro now */
engine->run_all_actors();
engine->empty_trash();
/* Let's free maestro now */
- delete simix_global->maestro_;
- simix_global->maestro_ = nullptr;
+ simix_global->destroy_maestro();
/* Finish context module and SURF */
simix_global->destroy_context_factory();
/* Finish context module and SURF */
simix_global->destroy_context_factory();
@@
-243,13
+241,9
@@
void SIMIX_clean()
*
* @return Return the clock.
*/
*
* @return Return the clock.
*/
-double SIMIX_get_clock()
+double SIMIX_get_clock()
// XBT_ATTRIB_DEPRECATED_v332
{
{
- if (MC_is_active() || MC_record_replay_is_active()) {
- return MC_process_clock_get(SIMIX_process_self());
- } else {
- return surf_get_clock();
- }
+ return simgrid::s4u::Engine::get_clock();
}
void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332
}
void SIMIX_run() // XBT_ATTRIB_DEPRECATED_v332
@@
-289,5
+283,5
@@
int SIMIX_is_maestro()
if (simix_global == nullptr) // SimDag
return true;
const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
if (simix_global == nullptr) // SimDag
return true;
const simgrid::kernel::actor::ActorImpl* self = SIMIX_process_self();
- return self == nullptr || s
elf == simix_global->maestro_
;
+ return self == nullptr || s
imix_global->is_maestro(self)
;
}
}