X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48efae676c3604efffe21365b2d525e578fd22e5..5c037db836667c8408d94daf61b893dd1efbabca:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 59b4c3da9a..f0de3ed8fd 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -21,16 +21,28 @@ namespace simgrid { namespace simix { + + /** @brief Process datatype + @ingroup simix_process_management + + A process may be defined as a code, with some private + data, executing in a location. + \see m_process_management + @{ */ + class Process; class Context; class ContextFactory; + } } typedef simgrid::simix::Context *smx_context_t; +typedef simgrid::simix::Process *smx_process_t; #else typedef struct s_smx_context *smx_context_t; +typedef struct s_smx_process *smx_process_t; #endif @@ -92,45 +104,13 @@ typedef xbt_dictelm_t smx_storage_t; typedef struct s_smx_storage_priv *smx_storage_priv_t; /* ****************************** Process *********************************** */ -/** @brief Process datatype - @ingroup simix_process_management - A process may be defined as a code, with some private - data, executing in a location. - \see m_process_management - @{ */ -typedef struct s_smx_process *smx_process_t; typedef enum { SMX_EXIT_SUCCESS = 0, SMX_EXIT_FAILURE = 1 } smx_process_exit_status_t; /** @} */ - -/* - * Type of function that creates a process. - * The function must accept the following parameters: - * void* process: the process created will be stored there - * const char *name: a name for the object. It is for user-level information and can be NULL - * xbt_main_func_t code: is a function describing the behavior of the process - * void *data: data a pointer to any data one may want to attach to the new object. - * sg_host_t host: the location where the new process is executed - * int argc, char **argv: parameters passed to code - * xbt_dict_t pros: properties - */ -typedef smx_process_t (*smx_creation_func_t) ( - /* name */ const char*, - /* code */ xbt_main_func_t, - /* userdata */ void*, - /* hostname */ const char*, - /* kill_time */ double, - /* argc */ int, - /* argv */ char**, - /* props */ xbt_dict_t, - /* auto_restart */ int, - /* parent_process */ smx_process_t); - - /******************************* Networking ***********************************/ /** * \ingroup simix_mbox_management @@ -173,7 +153,6 @@ XBT_PUBLIC(void) SIMIX_global_init(int *argc, char **argv); XBT_PUBLIC(void) SIMIX_set_maestro(void (*code)(void*), void* data); XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function); -XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function); XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t function); /* Simulation execution */