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
Remove useless #ifdef __cplusplus from hpp files.
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
db75282
..
b2e7d31
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-18,7
+18,7
@@
#include "src/surf/surf_interface.hpp"
#include "src/surf/xml/platf.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/surf/xml/platf.hpp"
-#include "smx_private.h"
+#include "smx_private.h
pp
"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "mc/mc.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "mc/mc.h"
@@
-35,15
+35,14
@@
#include "src/kernel/activity/SynchroRaw.hpp"
#if SIMGRID_HAVE_MC
#include "src/kernel/activity/SynchroRaw.hpp"
#if SIMGRID_HAVE_MC
-#include "src/mc/mc_private.h"
+#include "src/mc/mc_private.h
pp
"
#include "src/mc/remote/Client.hpp"
#include "src/mc/remote/mc_protocol.h"
#endif
#include "src/mc/remote/Client.hpp"
#include "src/mc/remote/mc_protocol.h"
#endif
-#include "src/mc/mc_record.h"
+#include "src/mc/mc_record.h
pp
"
#if HAVE_SMPI
#if HAVE_SMPI
-#include "src/smpi/include/private.h"
#include "src/smpi/include/private.hpp"
#endif
#include "src/smpi/include/private.hpp"
#endif
@@
-286,6
+285,8
@@
void SIMIX_clean()
}
/* Kill all processes (but maestro) */
SIMIX_process_killall(simix_global->maestro_process, 1);
}
/* Kill all processes (but maestro) */
SIMIX_process_killall(simix_global->maestro_process, 1);
+ SIMIX_context_runall();
+ SIMIX_process_empty_trash();
/* Exit the SIMIX network module */
SIMIX_mailbox_exit();
/* Exit the SIMIX network module */
SIMIX_mailbox_exit();
@@
-502,7
+503,7
@@
void SIMIX_run()
}
time = SIMIX_timer_next();
}
time = SIMIX_timer_next();
- if (time > -1.0 ||
simix_global->process_list.empty() == false
) {
+ if (time > -1.0 ||
not simix_global->process_list.empty()
) {
XBT_DEBUG("Calling surf_solve");
time = surf_solve(time);
XBT_DEBUG("Moving time ahead : %g", time);
XBT_DEBUG("Calling surf_solve");
time = surf_solve(time);
XBT_DEBUG("Moving time ahead : %g", time);
@@
-539,7
+540,7
@@
void SIMIX_run()
} while (time > -1.0 || not simix_global->process_to_run.empty());
} while (time > -1.0 || not simix_global->process_to_run.empty());
- if (
simix_global->process_list.size() != 0
) {
+ if (
not simix_global->process_list.empty()
) {
TRACE_end();
TRACE_end();