X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b741bb048b44a04d99689f6b64cf6628f15e550a..6e80e277a2e65be7caefd0e04e4954c4fc26c2d8:/src/kernel/context/ContextUnix.hpp diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp index 4df2375bf0..15b1b8722a 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 */ @@ -13,38 +13,28 @@ #include #include +#include "src/xbt/parmap.hpp" #include -#include #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 */ + 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 + void swap_into_for_real(SwappedContext* to) override; }; class UContextFactory : public SwappedContextFactory { public: - Context* create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t actor) override; + UContext* create_context(std::function&& code, actor::ActorImpl* actor) override; }; -}}} // namespace +} // namespace simgrid::kernel::context #endif