[sonar] Constify pointer and reference local variables in src/kernel/.

[simgrid.git] / src / kernel / context / ContextUnix.cpp

diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 9bae6d2..3cacf6d 100644 (file)
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -44,7 +44,7 @@ static void smx_ctx_wrapper(int i1, int i2)
   } catch (simgrid::ForcefulKillException const&) {
     XBT_DEBUG("Caught a ForcefulKillException");
   } catch (simgrid::Exception const& e) {
-    XBT_INFO("Actor killed by an uncatched exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
+    XBT_INFO("Actor killed by an uncaught exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
     throw;
   }
   ASAN_ONLY(context->asan_stop_ = true);
@@ -56,7 +56,7 @@ namespace kernel {
 namespace context {
 
 // UContextFactory
-Context* UContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
+UContext* UContextFactory::create_context(std::function<void()>&& code, actor::ActorImpl* actor)
 {
   return new_context<UContext>(std::move(code), actor, this);
 }
@@ -74,7 +74,7 @@ UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, Swappe
     this->uc_.uc_stack.ss_sp   = sg_makecontext_stack_addr(get_stack());
     this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_stack_size);
     // Makecontext expects integer arguments; we want to pass a pointer.
-    // This context address is decomposed into a serie of integers, which are passed as arguments to makecontext.
+    // This context address is decomposed into a series of integers, which are passed as arguments to makecontext.
 
     int ctx_addr[CTX_ADDR_LEN]{};
     UContext* arg = this;
@@ -83,7 +83,7 @@ UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, Swappe
 
 #if SIMGRID_HAVE_MC
     if (MC_is_active()) {
-      MC_register_stack_area(get_stack(), actor, &(this->uc_), smx_context_stack_size);
+      MC_register_stack_area(get_stack(), &(this->uc_), smx_context_stack_size);
     }
 #endif
   }
@@ -91,10 +91,10 @@ UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, Swappe
 
 void UContext::swap_into(SwappedContext* to_)
 {
-  UContext* to = static_cast<UContext*>(to_);
+  const UContext* to = static_cast<UContext*>(to_);
   ASAN_ONLY(void* fake_stack = nullptr);
-  ASAN_ONLY(to->asan_ctx_ = this);
-  ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to->asan_stack_, to->asan_stack_size_);
+  ASAN_ONLY(to_->asan_ctx_ = this);
+  ASAN_START_SWITCH(this->asan_stop_ ? nullptr : &fake_stack, to_->asan_stack_, to_->asan_stack_size_);
   swapcontext(&this->uc_, &to->uc_);
   ASAN_FINISH_SWITCH(fake_stack, &this->asan_ctx_->asan_stack_, &this->asan_ctx_->asan_stack_size_);
 }