X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7ddbdc25753a729517ed23899c83eb808acdd50f..8e7feffef5e41a487cc322c68265c09cc0d7bdf2:/src/kernel/context/ContextRaw.hpp diff --git a/src/kernel/context/ContextRaw.hpp b/src/kernel/context/ContextRaw.hpp index 89e72bc46b..f9b30e04bd 100644 --- a/src/kernel/context/ContextRaw.hpp +++ b/src/kernel/context/ContextRaw.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2020. 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_RAW_CONTEXT_HPP -#define SIMGRID_SIMIX_RAW_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_RAW_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_RAW_CONTEXT_HPP #include #include @@ -26,31 +26,21 @@ namespace context { */ class RawContext : public SwappedContext { public: - RawContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, - SwappedContextFactory* factory); - - void swap_into(SwappedContext* to) override; + RawContext(std::function&& code, actor::ActorImpl* actor, SwappedContextFactory* factory); private: /** pointer to top the stack stack */ void* stack_top_ = nullptr; -#if HAVE_SANITIZER_ADDRESS_FIBER_SUPPORT - const void* asan_stack_ = nullptr; - size_t asan_stack_size_ = 0; - RawContext* asan_ctx_ = nullptr; - bool asan_stop_ = false; -#endif - - static void wrapper(void* arg); + void swap_into_for_real(SwappedContext* to) override; }; class RawContextFactory : public SwappedContextFactory { public: - RawContextFactory() : SwappedContextFactory("RawContextFactory") {} - - Context* create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) override; + RawContext* create_context(std::function&& code, actor::ActorImpl* actor) override; }; -}}} // namespace +} // namespace context +} // namespace kernel +} // namespace simgrid #endif