/********************************** Simix Global ******************************/
typedef struct s_smx_global {
smx_context_factory_t context_factory;
- xbt_dict_t host;
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;
}
}
-
-
void SIMIX_context_mod_init(void);
void SIMIX_context_mod_exit(void);
+XBT_INLINE void SIMIX_context_set_current(smx_context_t context);
+XBT_INLINE smx_context_t SIMIX_context_get_current(void);
/* All factories init */
void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);
smx_process_t simix_process)
{
- return (*(simix_global->context_factory->create_context))
- (code, argc, argv, cleanup_func, simix_process);
+ return simix_global->context_factory->create_context(code,
+ argc, argv,
+ cleanup_func,
+ simix_process);
}
/**
*/
static XBT_INLINE void SIMIX_context_free(smx_context_t context)
{
- (*(simix_global->context_factory->free)) (context);
+ simix_global->context_factory->free(context);
}
/**
*/
static XBT_INLINE void SIMIX_context_stop(smx_context_t context)
{
- (*(simix_global->context_factory->stop)) (context);
+ simix_global->context_factory->stop(context);
}
/**
*/
static XBT_INLINE void SIMIX_context_suspend(smx_context_t context)
{
- (*(simix_global->context_factory->suspend)) (context);
+ simix_global->context_factory->suspend(context);
}
/**
- \brief executes all the processes (in parallel if possible)
- \param processes the dynar of processes to execute
+ \brief Executes all the processes to run (in parallel if possible).
*/
-static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes)
+static XBT_INLINE void SIMIX_context_runall()
{
- (*(simix_global->context_factory->runall)) (processes);
+ simix_global->context_factory->runall();
}
/**
static XBT_INLINE smx_context_t SIMIX_context_self(void)
{
if (simix_global && simix_global->context_factory != NULL) {
- return (*(simix_global->context_factory->self))();
+ return simix_global->context_factory->self();
}
return NULL;
*/
static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
{
- return (*(simix_global->context_factory->get_data))(context);
-}
-
-/**
- \brief returns the thread's pid running the current context
- \return The pid
- */
-static XBT_INLINE int SIMIX_context_get_thread_id(void)
-{
- return (*(simix_global->context_factory->get_thread_id))();
+ return simix_global->context_factory->get_data(context);
}
XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);