Drop simgrid::xbt::demangle and use boost::core::demangle instead.

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

diff --git a/src/kernel/context/ContextSwapped.cpp b/src/kernel/context/ContextSwapped.cpp
index 7b25012c58b17f8b56a8a0c9baa7ee71de7b71fb..bd913fb87c9ccf73ffc0bf25624b6f874599d652 100644 (file)
--- a/src/kernel/context/ContextSwapped.cpp
+++ b/src/kernel/context/ContextSwapped.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2021. 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. */
@@ -12,6 +12,9 @@
 
 #include "src/kernel/context/ContextSwapped.hpp"
 
+#include <boost/core/demangle.hpp>
+#include <memory>
+
 #ifdef _WIN32
 #include <malloc.h>
 #include <windows.h>
@@ -49,7 +52,7 @@ void smx_ctx_wrapper(simgrid::kernel::context::SwappedContext* context)
   } catch (simgrid::ForcefulKillException const&) {
     XBT_DEBUG("Caught a ForcefulKillException");
   } catch (simgrid::Exception const& e) {
-    XBT_INFO("Actor killed by an uncaught exception %s", simgrid::xbt::demangle(typeid(e).name()).get());
+    XBT_INFO("Actor killed by an uncaught exception %s", boost::core::demangle(typeid(e).name()).c_str());
     throw;
   }
 #if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT
@@ -89,7 +92,7 @@ SwappedContext::SwappedContext(std::function<void()>&& code, smx_actor_t actor,
 #if SIMGRID_HAVE_MC
       /* Cannot use posix_memalign when SIMGRID_HAVE_MC. Align stack by hand, and save the
        * pointer returned by xbt_malloc0. */
-      unsigned char* alloc = static_cast<unsigned char*>(xbt_malloc0(size + xbt_pagesize));
+      auto* alloc          = static_cast<unsigned char*>(xbt_malloc0(size + xbt_pagesize));
       stack_               = alloc - (reinterpret_cast<uintptr_t>(alloc) & (xbt_pagesize - 1)) + xbt_pagesize;
       reinterpret_cast<unsigned char**>(stack_)[-1] = alloc;
 #elif !defined(_WIN32)
@@ -170,7 +173,11 @@ SwappedContext::~SwappedContext()
 unsigned char* SwappedContext::get_stack_bottom() const
 {
   // Depending on the stack direction, its bottom (that make_fcontext needs) may be the lower or higher end
-  return PTH_STACKGROWTH == -1 ? stack_ + get_actor()->get_stacksize() : stack_;
+#if PTH_STACKGROWTH == 1
+  return stack_;
+#else
+  return stack_ + get_actor()->get_stacksize();
+#endif
 }
 
 void SwappedContext::stop()
@@ -208,8 +215,8 @@ void SwappedContextFactory::run_all()
   if (SIMIX_context_is_parallel()) {
     // We lazily create the parmap so that all options are actually processed when doing so.
     if (parmap_ == nullptr)
-      parmap_.reset(
-          new simgrid::xbt::Parmap<smx_actor_t>(SIMIX_context_get_nthreads(), SIMIX_context_get_parallel_mode()));
+      parmap_ = std::make_unique<simgrid::xbt::Parmap<smx_actor_t>>(SIMIX_context_get_nthreads(),
+                                                                    SIMIX_context_get_parallel_mode());
 
     // Usually, Parmap::apply() executes the provided function on all elements of the array.
     // Here, the executed function does not return the control to the parmap before all the array is processed:
@@ -219,7 +226,7 @@ void SwappedContextFactory::run_all()
     //   - So, resume() is only launched from the parmap for the first job of each minion.
     parmap_->apply(
         [](const actor::ActorImpl* process) {
-          SwappedContext* context = static_cast<SwappedContext*>(process->context_.get());
+          auto* context = static_cast<SwappedContext*>(process->context_.get());
           context->resume();
         },
         simix_global->actors_to_run);
@@ -243,7 +250,7 @@ void SwappedContextFactory::run_all()
  */
 void SwappedContext::resume()
 {
-  SwappedContext* old = static_cast<SwappedContext*>(self());
+  auto* old = static_cast<SwappedContext*>(self());
   if (SIMIX_context_is_parallel()) {
     // Save my current soul (either maestro, or one of the minions) in a thread-specific area
     worker_context_ = old;