/* \file UContext.cpp Context switching with ucontexts from System V */
-#include "ContextUnix.hpp"
#include "context_private.hpp"
#include "mc/mc.h"
+#include "simgrid/Exception.hpp"
#include "src/mc/mc_ignore.hpp"
#include "src/simix/ActorImpl.hpp"
+#include "ContextUnix.hpp"
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
/** Many integers are needed to store a pointer
this->uc_.uc_stack.ss_sp = sg_makecontext_stack_addr(this->stack_);
this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_usable_stack_size);
#if PTH_STACKGROWTH == -1
- ASAN_EVAL(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
+ ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
#else
- ASAN_EVAL(this->asan_stack_ = this->stack_);
+ ASAN_ONLY(this->asan_stack_ = this->stack_);
#endif
UContext::make_ctx(&this->uc_, UContext::smx_ctx_sysv_wrapper, this);
} else {
ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
try {
(*context)();
- context->Context::stop();
} catch (simgrid::kernel::context::Context::StopRequest const&) {
XBT_DEBUG("Caught a StopRequest");
+ } catch (simgrid::HostFailureException const&) {
+ XBT_DEBUG("Caught an HostFailureException");
}
- ASAN_EVAL(context->asan_stop_ = true);
+ context->Context::stop();
+ ASAN_ONLY(context->asan_stop_ = true);
context->suspend();
}
inline void UContext::swap(UContext* from, UContext* to)
{
- void* fake_stack = nullptr;
- ASAN_EVAL(to->asan_ctx_ = from);
+ ASAN_ONLY(void* fake_stack = nullptr);
+ ASAN_ONLY(to->asan_ctx_ = from);
ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
swapcontext(&from->uc_, &to->uc_);
ASAN_FINISH_SWITCH(fake_stack, &from->asan_ctx_->asan_stack_, &from->asan_ctx_->asan_stack_size_);
if (i < simix_global->process_to_run.size()) {
/* execute the next process */
XBT_DEBUG("Run next process");
- next_context = static_cast<SerialUContext*>(simix_global->process_to_run[i]->context);
+ next_context = static_cast<SerialUContext*>(simix_global->process_to_run[i]->context_);
} else {
/* all processes were run, return to maestro */
XBT_DEBUG("No more process to run");
return;
smx_actor_t first_process = simix_global->process_to_run.front();
process_index_ = 1;
- static_cast<SerialUContext*>(first_process->context)->resume();
+ static_cast<SerialUContext*>(first_process->context_)->resume();
}
// ParallelUContext
simgrid::xbt::Parmap<smx_actor_t>* ParallelUContext::parmap_;
std::atomic<uintptr_t> ParallelUContext::threads_working_; /* number of threads that have started their work */
-xbt_os_thread_key_t ParallelUContext::worker_id_key_; /* thread-specific storage for the thread id */
+thread_local uintptr_t ParallelUContext::worker_id_; /* thread-specific storage for the thread id */
std::vector<ParallelUContext*> ParallelUContext::workers_context_; /* space to save the worker's context
* in each thread */
parmap_ = nullptr;
workers_context_.clear();
workers_context_.resize(SIMIX_context_get_nthreads(), nullptr);
- xbt_os_thread_key_create(&worker_id_key_);
}
void ParallelUContext::finalize()
delete parmap_;
parmap_ = nullptr;
workers_context_.clear();
- xbt_os_thread_key_destroy(worker_id_key_);
}
void ParallelUContext::run_all()
parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
parmap_->apply(
[](smx_actor_t process) {
- ParallelUContext* context = static_cast<ParallelUContext*>(process->context);
+ ParallelUContext* context = static_cast<ParallelUContext*>(process->context_);
context->resume();
},
simix_global->process_to_run);
if (next_work) {
// There is a next soul to embody (ie, a next process to resume)
XBT_DEBUG("Run next process");
- next_context = static_cast<ParallelUContext*>(next_work.get()->context);
+ next_context = static_cast<ParallelUContext*>(next_work.get()->context_);
} else {
// All processes were run, go to the barrier
XBT_DEBUG("No more processes to run");
- // Get back the identity of my body that was stored when starting the scheduling round
- uintptr_t worker_id = reinterpret_cast<uintptr_t>(xbt_os_thread_get_specific(worker_id_key_));
+ // worker_id_ is the identity of my body, stored in thread_local when starting the scheduling round
// Deduce the initial soul of that body
- next_context = workers_context_[worker_id];
+ next_context = workers_context_[worker_id_];
// When given that soul, the body will wait for the next scheduling round
}
/** Run one particular simulated process on the current thread. */
void ParallelUContext::resume()
{
- // What is my containing body?
- uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
- // Store the number of my containing body in os-thread-specific area :
- xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
+ // What is my containing body? Store its number in os-thread-specific area :
+ worker_id_ = threads_working_.fetch_add(1, std::memory_order_relaxed);
// Get my current soul:
ParallelUContext* worker_context = static_cast<ParallelUContext*>(SIMIX_context_self());
// Write down that this soul is hosted in that body (for now)
- workers_context_[worker_id] = worker_context;
+ workers_context_[worker_id_] = worker_context;
// Write in simix that I switched my soul
SIMIX_context_set_current(this);
// Actually do that using the relevant library call: