X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/418ac8d537f356100767b8a21f65e16f7ba1d986..3e7a6085312ea8e0cc7b71adaef4074db9b15892:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 5f08cc025a..f600d3544a 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -1,90 +1,76 @@ -/* 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 "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_process_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/kernel/context/Context.hpp" -#ifdef __cplusplus +#include -#include +/********************************** Simix Global ******************************/ namespace simgrid { namespace simix { -/* Hack: let msg load directly the right factory - * - * This is a factory of factory! How nice is this? - */ -typedef ContextFactory* (*ContextFactoryInitializer)(void); -XBT_PUBLIC_DATA(ContextFactoryInitializer) factory_initializer; - -} -} +class Global { +public: + smx_context_factory_t context_factory = nullptr; + xbt_dynar_t process_to_run = nullptr; + xbt_dynar_t process_that_ran = nullptr; + std::map process_list; +#if SIMGRID_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_actor_t maestro_process = nullptr; -typedef simgrid::simix::ContextFactory *smx_context_factory_t; + // Maps function names to actor code: + std::unordered_map registered_functions; -#else + // This might be used when no corresponding function name is registered: + simgrid::simix::ActorCodeFactory default_function; -typedef struct s_smx_context_factory *smx_context_factory_t; + smx_creation_func_t create_process_function = nullptr; + void_pfn_smxprocess_t kill_process_function = nullptr; + /** Callback used when killing a SMX_process */ + void_pfn_smxprocess_t cleanup_process_function = nullptr; + xbt_os_mutex_t mutex = nullptr; -#endif + std::vector> tasks; + std::vector> tasksTemp; -SG_BEGIN_DECL() + std::vector daemons; +}; -/********************************** Simix Global ******************************/ -typedef struct s_smx_global { - smx_context_factory_t context_factory; - xbt_dynar_t process_to_run; - xbt_dynar_t process_that_ran; - xbt_swag_t process_list; - xbt_swag_t process_to_destroy; - smx_process_t maestro_process; - xbt_dict_t registered_functions; - smx_creation_func_t create_process_function; - void_pfn_smxprocess_t kill_process_function; - /** Callback used when killing a SMX_process */ - void_pfn_smxprocess_t cleanup_process_function; +} +} - xbt_os_mutex_t mutex; -} s_smx_global_t, *smx_global_t; +SG_BEGIN_DECL() -XBT_PUBLIC_DATA(smx_global_t) simix_global; -extern XBT_PRIVATE unsigned long simix_process_maxpid; +XBT_PUBLIC_DATA(std::unique_ptr) simix_global; -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 */\ - THROW_PREPARE(_smx_throw_issuer->running_ctx, (cat), (val), xbt_strdup(msg)); \ - _smx_throw_issuer->doexception = 1; \ +#define SMX_EXCEPTION(issuer, cat, val, msg) \ + if (1) { \ + smx_actor_t _smx_throw_issuer = (issuer); /* evaluate only once */ \ + xbt_ex e(XBT_THROW_POINT, msg); \ + e.category = cat; \ + e.value = val; \ + _smx_throw_issuer->exception = std::make_exception_ptr(e); \ } else ((void)0) /* ******************************** File ************************************ */ @@ -93,45 +79,6 @@ 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( - xbt_main_func_t code, int argc, char **argv, - 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 - -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); - -/* ****************************** */ -/* context manipulation functions */ -/* ****************************** */ - -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()