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++, classes don't need a name because they have a class
[simgrid.git]
/
src
/
kernel
/
context
/
ContextSwapped.cpp
diff --git
a/src/kernel/context/ContextSwapped.cpp
b/src/kernel/context/ContextSwapped.cpp
index
b550205
..
7775167
100644
(file)
--- a/
src/kernel/context/ContextSwapped.cpp
+++ b/
src/kernel/context/ContextSwapped.cpp
@@
-37,8
+37,7
@@
namespace context {
/* rank of the execution thread */
thread_local uintptr_t SwappedContext::worker_id_; /* thread-specific storage for the thread id */
/* rank of the execution thread */
thread_local uintptr_t SwappedContext::worker_id_; /* thread-specific storage for the thread id */
-SwappedContextFactory::SwappedContextFactory(std::string name)
- : ContextFactory(name), parallel_(SIMIX_context_is_parallel())
+SwappedContextFactory::SwappedContextFactory() : ContextFactory(), parallel_(SIMIX_context_is_parallel())
{
parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel)
workers_context_.clear();
{
parmap_ = nullptr; // will be created lazily with the right parameters if needed (ie, in parallel)
workers_context_.clear();
@@
-55,6
+54,10
@@
SwappedContext::SwappedContext(std::function<void()> code, void_pfn_smxprocess_t
SwappedContextFactory* factory)
: Context(std::move(code), cleanup_func, process), factory_(factory)
{
SwappedContextFactory* factory)
: Context(std::move(code), cleanup_func, process), factory_(factory)
{
+ // Save maestro (=context created first) in preparation for run_all
+ if (factory_->workers_context_[0] == nullptr)
+ factory_->workers_context_[0] = this;
+
if (has_code()) {
if (smx_context_guard_size > 0 && not MC_is_active()) {
if (has_code()) {
if (smx_context_guard_size > 0 && not MC_is_active()) {
@@
-134,12
+137,6
@@
SwappedContext::~SwappedContext()
xbt_free(stack_);
}
xbt_free(stack_);
}
-void SwappedContext::set_maestro(SwappedContext* ctx)
-{
- if (factory_->threads_working_ == 0) // Don't save the soul of minions, only the one of maestro
- factory_->workers_context_[0] = ctx;
-}
-
void* SwappedContext::get_stack()
{
return stack_;
void* SwappedContext::get_stack()
{
return stack_;