X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2a013c0e4ca407feeb7b3d0e85abba7acae2532..ef935e2af394f46f25314d9f841644fac7a4a715:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index fcb5469858..9ec2107dcc 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -1,67 +1,15 @@ -/* Copyright (c) 2007-2010, 2012-2015. 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 _SIMIX_PRIVATE_H -#define _SIMIX_PRIVATE_H - -#include -#include -#include -#include - -#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 "smx_host_private.h" -#include "smx_io_private.h" -#include "smx_network_private.h" -#include "popping_private.h" -#include "smx_synchro_private.h" +#ifndef SIMIX_PRIVATE_H +#define SIMIX_PRIVATE_H #include -#include "src/simix/ActorImpl.hpp" +#include "src/kernel/context/Context.hpp" -#ifdef __cplusplus - -#include - -namespace simgrid { -namespace simix { - -/* This allows Java to hijack the context factory (Java induces factories of factory :) */ -typedef ContextFactory* (*ContextFactoryInitializer)(void); -XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer; - -XBT_PRIVATE ContextFactory* thread_factory(); -XBT_PRIVATE ContextFactory* sysv_factory(); -XBT_PRIVATE ContextFactory* raw_factory(); -XBT_PRIVATE ContextFactory* boost_factory(); - -} -} - -typedef simgrid::simix::ContextFactory *smx_context_factory_t; - -#else - -typedef struct s_smx_context_factory *smx_context_factory_t; - -#endif +#include /********************************** Simix Global ******************************/ @@ -73,9 +21,19 @@ public: smx_context_factory_t context_factory = nullptr; xbt_dynar_t process_to_run = nullptr; xbt_dynar_t process_that_ran = nullptr; - xbt_swag_t process_list = nullptr; + std::map process_list; +#if HAVE_MC + /* MCer cannot read the std::map above in the remote process, so we copy the info it needs in a dynar. + * FIXME: This is supposed to be a temporary hack. + * A better solution would be to change the split between MCer and MCed, where the responsibility + * to compute the list of the enabled transitions goes to the MCed. + * That way, the MCer would not need to have the list of actors on its side. + * These info could be published by the MCed to the MCer in a way inspired of vd.so + */ + xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr); +#endif xbt_swag_t process_to_destroy = nullptr; - smx_process_t maestro_process = nullptr; + smx_actor_t maestro_process = nullptr; // Maps function names to actor code: std::unordered_map registered_functions; @@ -91,6 +49,8 @@ public: std::vector> tasks; std::vector> tasksTemp; + + std::vector daemons; }; } @@ -100,15 +60,13 @@ SG_BEGIN_DECL() XBT_PUBLIC_DATA(std::unique_ptr) simix_global; -extern XBT_PRIVATE unsigned long simix_process_maxpid; - -XBT_PUBLIC(void) SIMIX_clean(void); +XBT_PUBLIC(void) SIMIX_clean(); /******************************** Exceptions *********************************/ /** @brief Ask to the provided simix process to raise the provided exception */ #define SMX_EXCEPTION(issuer, cat, val, msg) \ if (1) { \ - smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */ \ + smx_actor_t _smx_throw_issuer = (issuer); /* evaluate only once */ \ xbt_ex e(XBT_THROW_POINT, msg); \ e.category = cat; \ e.value = val; \ @@ -121,59 +79,7 @@ typedef struct s_smx_file { void* data; /**< @brief user data */ } s_smx_file_t; -XBT_PRIVATE void SIMIX_context_mod_init(void); -XBT_PRIVATE void SIMIX_context_mod_exit(void); - -XBT_PRIVATE smx_context_t SIMIX_context_new( - std::function code, - void_pfn_smxprocess_t cleanup_func, - smx_process_t simix_process); - -#ifndef WIN32 -XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); -#endif - -/* 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. */ -#if HAVE_VALGRIND_H -# define smx_context_usable_stack_size \ - (smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */ -#else -# define smx_context_usable_stack_size smx_context_stack_size -#endif - -/** @brief Executes all the processes to run (in parallel if possible). */ -static inline void SIMIX_context_runall(void) -{ - if (!xbt_dynar_is_empty(simix_global->process_to_run)) - simix_global->context_factory->run_all(); -} - -/** @brief returns the current running context */ -static inline smx_context_t SIMIX_context_self(void) -{ - if (simix_global && simix_global->context_factory) - return simix_global->context_factory->self(); - else - return nullptr; -} - -XBT_PRIVATE void *SIMIX_context_stack_new(void); -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(int) SIMIX_process_get_maxpid(void); - -XBT_PRIVATE void SIMIX_post_create_environment(void); - -// FIXME, Dirty hack for SMPI+MSG -XBT_PRIVATE void SIMIX_process_set_cleanup_function(smx_process_t process, void_pfn_smxprocess_t cleanup); SG_END_DECL() -XBT_PRIVATE simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name); - #endif