Use real pointer type for context wrappers.

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

diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp
index f6eaf31..5e178af 100644 (file)
--- a/src/kernel/context/ContextRaw.cpp
+++ b/src/kernel/context/ContextRaw.cpp
@@ -13,11 +13,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
 
 // Raw context routines
 
-typedef void (*rawctx_entry_point_t)(void *);
+typedef void (*rawctx_entry_point_t)(simgrid::kernel::context::RawContext*);
 
 typedef void* raw_stack_t;
-extern "C" raw_stack_t raw_makecontext(void* malloced_stack, int stack_size,
-                                   rawctx_entry_point_t entry_point, void* arg);
+extern "C" raw_stack_t raw_makecontext(void* malloced_stack, int stack_size, rawctx_entry_point_t entry_point,
+                                       simgrid::kernel::context::RawContext* arg);
 extern "C" void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context);
 
 // TODO, we should handle FP, MMX and the x87 control-word (for x86 and x86_64)
@@ -167,13 +167,15 @@ __asm__ (
 /* If you implement raw contexts for other processors, don't forget to
    update the definition of HAVE_RAW_CONTEXTS in tools/cmake/CompleteInFiles.cmake */
 
-raw_stack_t raw_makecontext(void* malloced_stack, int stack_size,
-                            rawctx_entry_point_t entry_point, void* arg) {
-   THROW_UNIMPLEMENTED;
+raw_stack_t raw_makecontext(void* malloced_stack, int stack_size, rawctx_entry_point_t entry_point,
+                            simgrid::kernel::context::RawContext* arg)
+{
+  THROW_UNIMPLEMENTED;
 }
 
-void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context) {
-   THROW_UNIMPLEMENTED;
+void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context)
+{
+  THROW_UNIMPLEMENTED;
 }
 
 #endif
@@ -186,46 +188,36 @@ namespace context {
 
 // RawContextFactory
 
-Context* RawContextFactory::create_context(std::function<void()> code, void_pfn_smxprocess_t cleanup_func,
-                                           smx_actor_t process)
+Context* RawContextFactory::create_context(std::function<void()> code, smx_actor_t actor)
 {
-  return this->new_context<RawContext>(std::move(code), cleanup_func, process, this);
+  return this->new_context<RawContext>(std::move(code), actor, this);
 }
 
 // RawContext
 
-RawContext::RawContext(std::function<void()> code, void_pfn_smxprocess_t cleanup, smx_actor_t process,
-                       SwappedContextFactory* factory)
-    : SwappedContext(std::move(code), cleanup, process, factory)
+RawContext::RawContext(std::function<void()> code, smx_actor_t actor, SwappedContextFactory* factory)
+    : SwappedContext(std::move(code), actor, factory)
 {
    if (has_code()) {
-#if PTH_STACKGROWTH == -1
-     ASAN_ONLY(this->asan_stack_ = static_cast<char*>(this->stack_) + smx_context_usable_stack_size);
-#else
-     ASAN_ONLY(this->asan_stack_ = this->stack_);
-#endif
-     this->stack_top_ = raw_makecontext(this->stack_, smx_context_usable_stack_size, RawContext::wrapper, this);
+     this->stack_top_ = raw_makecontext(get_stack(), smx_context_usable_stack_size, RawContext::wrapper, this);
    } else {
-     set_maestro(this); // save maestro for run_all()
      if (MC_is_active())
        MC_ignore_heap(&stack_top_, sizeof(stack_top_));
    }
 }
 
-void RawContext::wrapper(void* arg)
+void RawContext::wrapper(RawContext* context)
 {
-  RawContext* context = static_cast<RawContext*>(arg);
   ASAN_FINISH_SWITCH(nullptr, &context->asan_ctx_->asan_stack_, &context->asan_ctx_->asan_stack_size_);
   try {
     (*context)();
-  } catch (StopRequest const&) {
-    XBT_DEBUG("Caught a StopRequest");
+    context->Context::stop();
+  } catch (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());
     throw;
   }
-  context->Context::stop();
-
   ASAN_ONLY(context->asan_stop_ = true);
   context->suspend();
 }