X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/465dac153770a28f3a334705a06a1ee7a457c965..5ed37babb2fa9097abe82df299c0aa259ed84d5a:/src/kernel/context/ContextUnix.hpp diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp index d3b3659509..fd1c8b5a4b 100644 --- a/src/kernel/context/ContextUnix.hpp +++ b/src/kernel/context/ContextUnix.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2023. 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. */ -#ifndef SIMGRID_SIMIX_UNIX_CONTEXT_HPP -#define SIMGRID_SIMIX_UNIX_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_UNIX_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_UNIX_CONTEXT_HPP #include /* context relative declarations */ @@ -19,37 +19,22 @@ #include "src/internal_config.h" #include "src/kernel/context/ContextSwapped.hpp" -namespace simgrid { -namespace kernel { -namespace context { +namespace simgrid::kernel::context { class UContext : public SwappedContext { public: - UContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor, - SwappedContextFactory* factory); - - void swap_into(SwappedContext* to) override; + UContext(std::function&& code, actor::ActorImpl* actor, SwappedContextFactory* factory); private: - ucontext_t uc_; /* the ucontext that executes the code */ - -#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT - const void* asan_stack_ = nullptr; - size_t asan_stack_size_ = 0; - UContext* asan_ctx_ = nullptr; - bool asan_stop_ = false; -#endif + ucontext_t uc_{}; /* the ucontext that executes the code */ - static void smx_ctx_sysv_wrapper(int, int); - static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg); + void swap_into_for_real(SwappedContext* to) override; }; class UContextFactory : public SwappedContextFactory { public: - UContextFactory() : SwappedContextFactory("UContextFactory") {} - - Context* create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override; + UContext* create_context(std::function&& code, actor::ActorImpl* actor) override; }; -}}} // namespace +} // namespace simgrid::kernel::context #endif