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
In C++ files, replace SG_{BEGIN,END}+_DECL() by extern "C" { }.
[simgrid.git]
/
src
/
kernel
/
context
/
ContextRaw.cpp
diff --git
a/src/kernel/context/ContextRaw.cpp
b/src/kernel/context/ContextRaw.cpp
index
00c6008
..
17f77d5
100644
(file)
--- a/
src/kernel/context/ContextRaw.cpp
+++ b/
src/kernel/context/ContextRaw.cpp
@@
-7,7
+7,7
@@
#include "xbt/parmap.hpp"
#include "xbt/parmap.hpp"
-#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.h
pp
"
#include "mc/mc.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
#include "mc/mc.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
@@
-270,7
+270,7
@@
RawContextFactory::RawContextFactory()
raw_workers_context = xbt_new(RawContext*, nthreads);
raw_maestro_context = nullptr;
#endif
raw_workers_context = xbt_new(RawContext*, nthreads);
raw_maestro_context = nullptr;
#endif
- // TODO
, if(SIMIX_context_get_parallel_threshold() > 1) => choose dynamically
+ // TODO
: choose dynamically when SIMIX_context_get_parallel_threshold() > 1
}
}
}
}
@@
-293,8
+293,8
@@
void RawContext::wrapper(void* arg)
RawContext* context = static_cast<RawContext*>(arg);
try {
(*context)();
RawContext* context = static_cast<RawContext*>(arg);
try {
(*context)();
- context->stop();
- } catch (StopRequest) {
+ context->
Context::
stop();
+ } catch (StopRequest
const&
) {
XBT_DEBUG("Caught a StopRequest");
}
context->suspend();
XBT_DEBUG("Caught a StopRequest");
}
context->suspend();