From 31d00d99590955a66d0e575e9af34e48736bab79 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 21 Jan 2019 12:09:21 +0100 Subject: [PATCH] Cosmetics. --- src/kernel/context/ContextSwapped.cpp | 3 --- src/kernel/context/ContextUnix.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp index 7775167df7..100dcba71c 100644 --- a/src/kernel/context/ContextSwapped.cpp +++ b/src/kernel/context/ContextSwapped.cpp @@ -40,14 +40,11 @@ thread_local uintptr_t SwappedContext::worker_id_; /* thread-specifi 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(); workers_context_.resize(parallel_ ? SIMIX_context_get_nthreads() : 1, nullptr); } SwappedContextFactory::~SwappedContextFactory() { delete parmap_; - parmap_ = nullptr; - workers_context_.clear(); } SwappedContext::SwappedContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp index 09711d033c..3042e2fe57 100644 --- a/src/kernel/context/ContextUnix.cpp +++ b/src/kernel/context/ContextUnix.cpp @@ -86,13 +86,13 @@ UContext::UContext(std::function code, void_pfn_smxprocess_t cleanup_fun UContext* arg = this; memcpy(ctx_addr, &arg, sizeof this); makecontext(&this->uc_, (void (*)())smx_ctx_wrapper, 2, ctx_addr[0], ctx_addr[1]); - } #if SIMGRID_HAVE_MC - if (MC_is_active() && has_code()) { - MC_register_stack_area(get_stack(), actor, &(this->uc_), smx_context_usable_stack_size); - } + if (MC_is_active()) { + MC_register_stack_area(get_stack(), actor, &(this->uc_), smx_context_usable_stack_size); + } #endif + } } void UContext::swap_into(SwappedContext* to_) -- 2.20.1