X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6658e9f2ff4a24cc2e074c654f8f818be1d79089..82e2aa78964d9150810411ce80fa62ab3aa4aaa9:/src/kernel/context/ContextUnix.hpp?ds=sidebyside diff --git a/src/kernel/context/ContextUnix.hpp b/src/kernel/context/ContextUnix.hpp index 00c4832144..cec22ac4a3 100644 --- a/src/kernel/context/ContextUnix.hpp +++ b/src/kernel/context/ContextUnix.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -15,7 +15,6 @@ #include #include -#include #include "src/internal_config.h" #include "src/kernel/context/ContextSwapped.hpp" @@ -26,32 +25,20 @@ namespace context { class UContext : public SwappedContext { public: - UContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process, - SwappedContextFactory* factory); - ~UContext() override; + UContext(std::function&& code, actor::ActorImpl* actor, SwappedContextFactory* factory); void swap_into(SwappedContext* to) override; 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 - - static void smx_ctx_sysv_wrapper(int, int); - static void make_ctx(ucontext_t* ucp, void (*func)(int, int), UContext* arg); }; 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 context +} // namespace kernel +} // namespace simgrid #endif