X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a62b64d7cff5f86059bf7ec5df2d4f60a61a827b..fae10815035e4d0d150ff5fdbb7aa8fe25448c57:/src/simix/smx_private.h diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h index 0e542ca3e8..108b770ecb 100644 --- a/src/simix/smx_private.h +++ b/src/simix/smx_private.h @@ -7,6 +7,13 @@ #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" @@ -36,13 +43,15 @@ namespace simgrid { namespace simix { -/* Hack: let msg load directly the right factory - * - * This is a factory of factory! How nice is this? - */ +/* 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(); + } } @@ -54,38 +63,56 @@ typedef struct s_smx_context_factory *smx_context_factory_t; #endif -SG_BEGIN_DECL() - /********************************** 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; + +namespace simgrid { +namespace simix { + +class Global { +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; + xbt_swag_t process_to_destroy = nullptr; + smx_process_t maestro_process = nullptr; + + // Maps function names to actor code: + std::unordered_map registered_functions; + + // This might be used when no corresponding function name is registered: + simgrid::simix::ActorCodeFactory default_function; + + 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; - xbt_mallocator_t synchro_mallocator; + void_pfn_smxprocess_t cleanup_process_function = nullptr; + xbt_os_mutex_t mutex = nullptr; + + std::vector> tasks; + std::vector> tasksTemp; +}; - xbt_os_mutex_t mutex; -} s_smx_global_t, *smx_global_t; +} +} + +SG_BEGIN_DECL() + +XBT_PUBLIC_DATA(std::unique_ptr) simix_global; -XBT_PUBLIC_DATA(smx_global_t) simix_global; extern XBT_PRIVATE unsigned long simix_process_maxpid; XBT_PUBLIC(void) SIMIX_clean(void); /******************************** 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_process_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 ************************************ */ @@ -94,109 +121,11 @@ typedef struct s_smx_file { void* data; /**< @brief user data */ } s_smx_file_t; -/********************************* synchro *************************************/ - -typedef enum { - SIMIX_SYNC_EXECUTE, - SIMIX_SYNC_PARALLEL_EXECUTE, - SIMIX_SYNC_COMMUNICATE, - SIMIX_SYNC_JOIN, - SIMIX_SYNC_SLEEP, - SIMIX_SYNC_SYNCHRO, - SIMIX_SYNC_IO, -} e_smx_synchro_type_t; - -typedef enum { - SIMIX_COMM_SEND, - SIMIX_COMM_RECEIVE, - SIMIX_COMM_READY, - SIMIX_COMM_DONE -} e_smx_comm_type_t; - -typedef enum { - SIMIX_IO_OPEN, - SIMIX_IO_WRITE, - SIMIX_IO_READ, - SIMIX_IO_STAT -} e_smx_io_type_t; - -/** @brief synchro datatype */ -typedef struct s_smx_synchro { - - e_smx_synchro_type_t type; /* Type of SIMIX synchro */ - e_smx_state_t state; /* State of the synchro */ - char *name; /* synchro name if any */ - xbt_fifo_t simcalls; /* List of simcalls waiting for this synchro */ - - /* Data specific to each synchro type */ - union { - - struct { - sg_host_t host; /* The host where the execution takes place */ - surf_action_t surf_exec; /* The Surf execution action encapsulated */ - } execution; /* Possibly parallel execution */ - - struct { - e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */ - smx_mailbox_t mbox; /* Rendez-vous where the comm is queued */ - -#if HAVE_MC - smx_mailbox_t mbox_cpy; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR - (comm.mbox set to NULL when the communication is removed from the mailbox - (used as garbage collector)) */ -#endif - int refcount; /* Number of processes involved in the cond */ - int detached; /* If detached or not */ - - void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */ - int (*match_fun)(void*,void*,smx_synchro_t); /* Filter function used by the other side. It is used when - looking if a given communication matches my needs. For that, myself must match the - expectations of the other side, too. See */ - void (*copy_data_fun) (smx_synchro_t, void*, size_t); - - /* Surf action data */ - surf_action_t surf_comm; /* The Surf communication action encapsulated */ - surf_action_t src_timeout; /* Surf's actions to instrument the timeouts */ - surf_action_t dst_timeout; /* Surf's actions to instrument the timeouts */ - smx_process_t src_proc; - smx_process_t dst_proc; - double rate; - double task_size; - - /* Data to be transfered */ - void *src_buff; - void *dst_buff; - size_t src_buff_size; - size_t *dst_buff_size; - unsigned copied:1; /* whether the data were already copied */ - - void* src_data; /* User data associated to communication */ - void* dst_data; - } comm; - - struct { - sg_host_t host; /* The host that is sleeping */ - surf_action_t surf_sleep; /* The Surf sleeping action encapsulated */ - } sleep; - - struct { - surf_action_t sleep; - } synchro; - - struct { - sg_host_t host; - surf_action_t surf_io; - } io; - }; - - char *category; /* simix action category for instrumentation */ -} s_smx_synchro_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, + std::function code, void_pfn_smxprocess_t cleanup_func, smx_process_t simix_process); @@ -214,24 +143,37 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]); # 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); -/* ****************************** */ -/* 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); +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