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 pull request #279 from sthibaul/breakpoint
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
1291451
..
f0b03ad
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-163,7
+163,7
@@
simgrid::config::Flag<double> breakpoint{"simix/breakpoint",
}
}
}
}
-static s
td::function<void()>
maestro_code;
+static s
imgrid::simix::ActorCode
maestro_code;
void SIMIX_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32
void SIMIX_set_maestro(void (*code)(void*), void* data)
{
#ifdef _WIN32
@@
-397,7
+397,7
@@
void SIMIX_run()
do {
XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size());
do {
XBT_DEBUG("New Schedule Round; size(queue)=%zu", simix_global->process_to_run.size());
- if (simgrid::simix::breakpoint >= 0.0 &&
time
>= simgrid::simix::breakpoint) {
+ if (simgrid::simix::breakpoint >= 0.0 &&
surf_get_clock()
>= simgrid::simix::breakpoint) {
XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get());
simgrid::simix::breakpoint = -1.0;
#ifdef SIGTRAP
XBT_DEBUG("Breakpoint reached (%g)", simgrid::simix::breakpoint.get());
simgrid::simix::breakpoint = -1.0;
#ifdef SIGTRAP