X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/940de22d7f2af82d58be3e886e6bc22608b4d8ec..465dac153770a28f3a334705a06a1ee7a457c965:/src/kernel/context/Context.hpp diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index d33af391de..10ddbe6000 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -6,32 +6,14 @@ #ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP #define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP -#include -#include -#include -#include - -#include - -#include "simgrid/simix.h" -#include "src/instr/instr_private.hpp" +#include "simgrid/forward.h" #include "src/internal_config.h" -#include "src/simix/popping_private.hpp" -#include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_io_private.hpp" -#include "src/simix/smx_network_private.hpp" -#include "src/simix/smx_synchro_private.hpp" -#include "surf/surf.hpp" -#include "xbt/base.h" -#include "xbt/config.h" -#include "xbt/function_types.h" -#include "xbt/mallocator.h" -#include "xbt/xbt_os_time.h" - -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/activity/ActivityImpl.hpp" + #include -#include +/* Process creation/destruction callbacks */ +typedef void (*void_pfn_smxprocess_t)(smx_actor_t); namespace simgrid { namespace kernel { @@ -46,62 +28,75 @@ public: virtual ~ContextFactory(); virtual Context* create_context(std::function code, void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0; - // Optional methods for attaching main() as a context: - - /** Creates a context from the current context of execution - * - * This will not work on all implementation of `ContextFactory`. - */ + /** Turn the current thread into a simulation context */ virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process); + /** Turn the current thread into maestro (the old maestro becomes a regular actor) */ virtual Context* create_maestro(std::function code, smx_actor_t process); virtual void run_all() = 0; - virtual Context* self(); std::string const& name() const { return name_; } -private: - void declare_context(void* T, std::size_t size); protected: template T* new_context(Args&&... args) { T* context = new T(std::forward(args)...); - this->declare_context(context, sizeof(T)); + context->declare_context(sizeof(T)); return context; } }; class XBT_PUBLIC Context { + friend ContextFactory; + private: std::function code_; void_pfn_smxprocess_t cleanup_func_ = nullptr; - smx_actor_t process_ = nullptr; + smx_actor_t actor_ = nullptr; + void declare_context(std::size_t size); public: - class 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. - * Otherwise, users may accidentally catch it with a try {} catch (std::exception) - */ - }; - bool iwannadie; + bool iwannadie = false; + + Context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor); + Context(const Context&) = delete; + Context& operator=(const Context&) = delete; + virtual ~Context(); - Context(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process); void operator()() { code_(); } bool has_code() const { return static_cast(code_); } - smx_actor_t process() { return this->process_; } + smx_actor_t get_actor() { return this->actor_; } void set_cleanup(void_pfn_smxprocess_t cleanup) { cleanup_func_ = cleanup; } - // Virtual methods - virtual ~Context(); + // Scheduling methods virtual void stop(); virtual void suspend() = 0; + + // Retrieving the self() context + /** @brief Retrives the current context of this thread */ + static Context* self(); + /** @brief Sets the current context of this thread */ + static void set_current(Context* self); + + class 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(std::string msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {} + const char* what() const noexcept { return msg_.c_str(); } + + private: + std::string msg_ = std::string("Actor killed."); + }; }; class XBT_PUBLIC AttachContext : public Context { public: - AttachContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t process) - : Context(std::move(code), cleanup_func, process) + AttachContext(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t actor) + : Context(std::move(code), cleanup_func, actor) { } @@ -118,7 +113,7 @@ public: /* This allows Java to hijack the context factory (Java induces factories of factory :) */ typedef ContextFactory* (*ContextFactoryInitializer)(); -XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer; +XBT_PUBLIC_DATA ContextFactoryInitializer factory_initializer; XBT_PRIVATE ContextFactory* thread_factory(); XBT_PRIVATE ContextFactory* sysv_factory(); @@ -129,8 +124,6 @@ XBT_PRIVATE ContextFactory* boost_factory(); typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t; -extern "C" { - XBT_PRIVATE void SIMIX_context_mod_init(); XBT_PRIVATE void SIMIX_context_mod_exit(); @@ -138,7 +131,7 @@ XBT_PUBLIC smx_context_t SIMIX_context_new(std::function code, void_pfn_ smx_actor_t simix_process); #ifndef WIN32 -XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); +XBT_PUBLIC_DATA char sigsegv_stack[SIGSTKSZ]; #endif /* We are using the bottom of the stack to save some information, like the @@ -153,20 +146,11 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); /** @brief Executes all the processes to run (in parallel if possible). */ XBT_PRIVATE void SIMIX_context_runall(); -/** @brief returns the current running context */ -XBT_PUBLIC smx_context_t SIMIX_context_self(); // public because it's used in simgrid-java - -XBT_PRIVATE void *SIMIX_context_stack_new(); -XBT_PRIVATE void SIMIX_context_stack_delete(void *stack); - -XBT_PUBLIC void SIMIX_context_set_current(smx_context_t context); -XBT_PRIVATE smx_context_t SIMIX_context_get_current(); XBT_PUBLIC int SIMIX_process_get_maxpid(); XBT_PRIVATE void SIMIX_post_create_environment(); -} -XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name); +XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string name); #endif