X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8816765fafedb6fe7a30a663d1fd2eb3955c06f5..038fd3c4a495508204a7b9c2e9745426a0bfadf1:/src/kernel/context/Context.hpp diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index e1e7bf10d6..c02dd39ea4 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -19,6 +19,8 @@ namespace context { class XBT_PUBLIC ContextFactory { public: explicit ContextFactory() {} + ContextFactory(const ContextFactory&) = delete; + ContextFactory& operator=(const ContextFactory&) = delete; virtual ~ContextFactory(); virtual Context* create_context(std::function code, smx_actor_t actor) = 0; @@ -71,7 +73,8 @@ public: class XBT_PUBLIC AttachContext : public Context { public: AttachContext(std::function code, smx_actor_t actor) : Context(std::move(code), actor) {} - + AttachContext(const AttachContext&) = delete; + AttachContext& operator=(const AttachContext&) = delete; ~AttachContext() override; /** Called by the context when it is ready to give control @@ -83,24 +86,6 @@ public: virtual void attach_stop() = 0; }; -class XBT_PUBLIC StopRequest { - /** @brief Exception launched to kill a process, in order to properly unwind its stack and release RAII stuff - * - * Nope, Sonar, this should not inherit of std::exception nor of simgrid::Exception. - * Otherwise, users may accidentally catch it with a try {} catch (std::exception) - */ -public: - StopRequest() = default; - explicit StopRequest(const std::string& msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {} - ~StopRequest(); - const char* what() const noexcept { return msg_.c_str(); } - - static void do_throw(); - static bool try_n_catch(std::function try_block); - -private: - std::string msg_ = std::string("Actor killed."); -}; /* This allows Java to hijack the context factory (Java induces factories of factory :) */ typedef ContextFactory* (*ContextFactoryInitializer)(); @@ -119,7 +104,7 @@ XBT_PRIVATE void SIMIX_context_mod_init(); XBT_PRIVATE void SIMIX_context_mod_exit(); #ifndef WIN32 -XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ]; +XBT_PUBLIC_DATA unsigned char sigsegv_stack[SIGSTKSZ]; #endif /** @brief Executes all the processes to run (in parallel if possible). */