X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b686073e4e6991ea9ae4154a13bf693acd738551..110667488fe88af47341980b95d2231fcaca1e2c:/src/kernel/context/Context.hpp diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index eab87f8071..c5a459a5f1 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2017. 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_KERNEL_CONTEXT_CONTEXT_HPP -#define _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP +#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP +#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP #include #include @@ -13,27 +13,23 @@ #include -#include "src/internal_config.h" #include "simgrid/simix.h" -#include "surf/surf.h" -#include "xbt/base.h" -#include "xbt/fifo.h" -#include "xbt/swag.h" -#include "xbt/dict.h" -#include "xbt/mallocator.h" -#include "xbt/config.h" -#include "xbt/xbt_os_time.h" -#include "xbt/function_types.h" -#include "src/xbt/ex_interface.h" #include "src/instr/instr_private.h" +#include "src/internal_config.h" +#include "src/simix/popping_private.h" #include "src/simix/smx_host_private.h" #include "src/simix/smx_io_private.h" #include "src/simix/smx_network_private.h" -#include "src/simix/popping_private.h" -#include "src/simix/smx_synchro_private.h" +#include "src/simix/smx_synchro_private.hpp" +#include "surf/surf.h" +#include "xbt/base.h" +#include "xbt/config.h" +#include "xbt/function_types.h" +#include "xbt/mallocator.h" +#include "xbt/xbt_os_time.h" -#include #include "src/simix/ActorImpl.hpp" +#include #include @@ -41,8 +37,6 @@ namespace simgrid { namespace kernel { namespace context { - class Context; - XBT_PUBLIC_CLASS ContextFactory { private: std::string name_; @@ -51,7 +45,7 @@ namespace context { explicit ContextFactory(std::string name) : name_(std::move(name)) {} virtual ~ContextFactory(); virtual Context* create_context(std::function code, - void_pfn_smxprocess_t cleanup, smx_process_t process) = 0; + void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0; // Optional methods for attaching main() as a context: @@ -59,8 +53,8 @@ namespace context { * * This will not work on all implementation of `ContextFactory`. */ - virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process); - virtual Context* create_maestro(std::function code, smx_process_t process); + virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process); + virtual Context* create_maestro(std::function code, smx_actor_t process); virtual void run_all() = 0; virtual Context* self(); @@ -84,22 +78,24 @@ namespace context { private: std::function code_; void_pfn_smxprocess_t cleanup_func_ = nullptr; - smx_process_t process_ = nullptr; + smx_actor_t process_ = nullptr; public: + class StopRequest { + }; bool iwannadie; - public: + Context(std::function code, void_pfn_smxprocess_t cleanup_func, - smx_process_t process); + smx_actor_t process); void operator()() { code_(); } bool has_code() const { - return (bool) code_; + return static_cast(code_); } - smx_process_t process() + smx_actor_t process() { return this->process_; } @@ -119,7 +115,7 @@ namespace context { AttachContext(std::function code, void_pfn_smxprocess_t cleanup_func, - smx_process_t process) + smx_actor_t process) : Context(std::move(code), cleanup_func, process) {} @@ -135,7 +131,7 @@ namespace context { }; /* This allows Java to hijack the context factory (Java induces factories of factory :) */ -typedef ContextFactory* (*ContextFactoryInitializer)(void); +typedef ContextFactory* (*ContextFactoryInitializer)(); XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer; XBT_PRIVATE ContextFactory* thread_factory(); @@ -150,13 +146,11 @@ typedef simgrid::kernel::context::ContextFactory *smx_context_factory_t; SG_BEGIN_DECL() -XBT_PRIVATE void SIMIX_context_mod_init(void); -XBT_PRIVATE void SIMIX_context_mod_exit(void); +XBT_PRIVATE void SIMIX_context_mod_init(); +XBT_PRIVATE void SIMIX_context_mod_exit(); -XBT_PRIVATE smx_context_t SIMIX_context_new( - std::function code, - void_pfn_smxprocess_t cleanup_func, - smx_process_t simix_process); +XBT_PUBLIC(smx_context_t) +SIMIX_context_new(std::function code, void_pfn_smxprocess_t cleanup_func, smx_actor_t simix_process); #ifndef WIN32 XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); @@ -164,28 +158,28 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); /* We are using the bottom of the stack to save some information, like the * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining - * size for the stack. */ + * size for the stack. Round its value to a multiple of 16 (asan wants the stacks to be aligned this way). */ #if HAVE_VALGRIND_H -# define smx_context_usable_stack_size \ - (smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */ +#define smx_context_usable_stack_size \ + ((smx_context_stack_size - sizeof(unsigned int)) & ~0xf) /* for valgrind_stack_id */ #else -# define smx_context_usable_stack_size smx_context_stack_size +#define smx_context_usable_stack_size (smx_context_stack_size & ~0xf) #endif /** @brief Executes all the processes to run (in parallel if possible). */ -XBT_PRIVATE void SIMIX_context_runall(void); +XBT_PRIVATE void SIMIX_context_runall(); /** @brief returns the current running context */ -XBT_PUBLIC(smx_context_t) SIMIX_context_self(void); // public because it's used in simgrid-java +XBT_PUBLIC(smx_context_t) SIMIX_context_self(); // public because it's used in simgrid-java -XBT_PRIVATE void *SIMIX_context_stack_new(void); +XBT_PRIVATE void *SIMIX_context_stack_new(); XBT_PRIVATE void SIMIX_context_stack_delete(void *stack); -XBT_PRIVATE void SIMIX_context_set_current(smx_context_t context); -XBT_PRIVATE smx_context_t SIMIX_context_get_current(void); +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(void); +XBT_PUBLIC(int) SIMIX_process_get_maxpid(); -XBT_PRIVATE void SIMIX_post_create_environment(void); +XBT_PRIVATE void SIMIX_post_create_environment(); SG_END_DECL()