X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..2d37e348a09783cda723c7019640ee69de168324:/src/kernel/context/ContextSwapped.hpp diff --git a/src/kernel/context/ContextSwapped.hpp b/src/kernel/context/ContextSwapped.hpp index da798ed468..aba97d5b95 100644 --- a/src/kernel/context/ContextSwapped.hpp +++ b/src/kernel/context/ContextSwapped.hpp @@ -18,7 +18,7 @@ class SwappedContext; class SwappedContextFactory : public ContextFactory { friend SwappedContext; // Reads whether we are in parallel mode public: - explicit SwappedContextFactory(std::string name); + SwappedContextFactory(); ~SwappedContextFactory() override; void run_all() override; @@ -35,7 +35,7 @@ private: class SwappedContext : public Context { public: - SwappedContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, + SwappedContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t get_actor, SwappedContextFactory* factory); virtual ~SwappedContext(); @@ -45,16 +45,20 @@ public: virtual void swap_into(SwappedContext* to) = 0; // Defined in Raw, Boost and UContext subclasses - void set_maestro(SwappedContext* ctx); + void* get_stack(); - // FIXME: Killme static thread_local uintptr_t worker_id_; -protected: - void* stack_ = nullptr; /* the thread stack */ +#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT + const void* asan_stack_ = nullptr; + size_t asan_stack_size_ = 0; + SwappedContext* asan_ctx_ = nullptr; + bool asan_stop_ = false; +#endif private: - SwappedContextFactory* factory_; // for sequential and parallel run_all() + void* stack_ = nullptr; /* the thread stack */ + SwappedContextFactory* const factory_; // for sequential and parallel run_all() }; } // namespace context