-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "ContextBoost.hpp"
-
-#include <utility>
-#include <xbt/log.h>
-
-#if HAVE_SANITIZE_ADDRESS_FIBER_SUPPORT
-#include <sanitizer/asan_interface.h>
-#define ASAN_EVAL(expr) (expr)
-#define ASAN_START_SWITCH(fake_stack_save, bottom, size) __sanitizer_start_switch_fiber(fake_stack_save, bottom, size)
-#define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) \
- __sanitizer_finish_switch_fiber(fake_stack_save, bottom_old, size_old)
-#else
-#define ASAN_EVAL(expr) (void)0
-#define ASAN_START_SWITCH(fake_stack_save, bottom, size) (void)0
-#define ASAN_FINISH_SWITCH(fake_stack_save, bottom_old, size_old) (void)(fake_stack_save)
-#endif
+#include "context_private.hpp"
+#include "src/simix/smx_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
boost::context::jump_fcontext(&from->fc_, to->fc_, reinterpret_cast<intptr_t>(to));
#else
BoostContext* ctx[2] = {from, to};
- void* fake_stack;
+ void* fake_stack = nullptr;
ASAN_START_SWITCH(from->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
boost::context::detail::transfer_t arg = boost::context::detail::jump_fcontext(to->fc_, ctx);
ASAN_FINISH_SWITCH(fake_stack, &static_cast<BoostContext**>(arg.data)[0]->asan_stack_,
XBT_DEBUG("No more process to run");
next_context = static_cast<SerialBoostContext*>(BoostContext::getMaestro());
}
- SIMIX_context_set_current(static_cast<smx_context_t>(next_context));
+ SIMIX_context_set_current(next_context);
BoostContext::swap(this, next_context);
}
#if HAVE_THREAD_CONTEXTS
simgrid::xbt::Parmap<smx_actor_t>* ParallelBoostContext::parmap_;
-uintptr_t ParallelBoostContext::threads_working_;
+std::atomic<uintptr_t> ParallelBoostContext::threads_working_;
xbt_os_thread_key_t ParallelBoostContext::worker_id_key_;
std::vector<ParallelBoostContext*> ParallelBoostContext::workers_context_;
delete parmap_;
parmap_ = nullptr;
workers_context_.clear();
+ xbt_os_thread_key_destroy(worker_id_key_);
}
void ParallelBoostContext::run_all()
{
threads_working_ = 0;
- if (not parmap_)
+ if (parmap_ == nullptr)
parmap_ = new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode());
parmap_->apply(
[](smx_actor_t process) {
ParallelBoostContext* context = static_cast<ParallelBoostContext*>(process->context);
- return context->resume();
+ context->resume();
},
simix_global->process_to_run);
}
void ParallelBoostContext::resume()
{
- uintptr_t worker_id = __sync_fetch_and_add(&threads_working_, 1);
+ uintptr_t worker_id = threads_working_.fetch_add(1, std::memory_order_relaxed);
xbt_os_thread_set_specific(worker_id_key_, reinterpret_cast<void*>(worker_id));
ParallelBoostContext* worker_context = static_cast<ParallelBoostContext*>(SIMIX_context_self());
- workers_context_[worker_id] = worker_context;
+ workers_context_[worker_id] = worker_context;
SIMIX_context_set_current(this);
BoostContext::swap(worker_context, this);