typedef struct s_smx_context_factory *smx_context_factory_t;
-typedef struct SIMIX_Global {
+typedef struct s_smx_global {
smx_context_factory_t context_factory;
xbt_dict_t host;
xbt_swag_t process_to_run;
xbt_swag_t process_list;
xbt_swag_t process_to_destroy;
- smx_process_t current_process;
smx_process_t maestro_process;
xbt_dict_t registered_functions;
smx_creation_func_t create_process_function;
#ifdef HAVE_LATENCY_BOUND_TRACKING
xbt_dict_t latency_limited_dict;
#endif
-} s_SIMIX_Global_t, *SIMIX_Global_t;
+} s_smx_global_t, *smx_global_t;
-extern SIMIX_Global_t simix_global;
+extern smx_global_t simix_global;
/*********************************** Time ************************************/
struct {
surf_action_t sleep;
} synchro;
-
+
};
#ifdef HAVE_TRACING
typedef smx_context_t(*smx_pfn_context_factory_create_context_t)
- (xbt_main_func_t, int, char **, void_pfn_smxprocess_t, smx_process_t);
-typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t
- *);
+ (xbt_main_func_t, int, char **, void_pfn_smxprocess_t, void* data);
+typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t*);
typedef void (*smx_pfn_context_free_t) (smx_context_t);
typedef void (*smx_pfn_context_start_t) (smx_context_t);
typedef void (*smx_pfn_context_stop_t) (smx_context_t);
typedef void (*smx_pfn_context_suspend_t) (smx_context_t context);
typedef void (*smx_pfn_context_runall_t) (xbt_swag_t processes);
-typedef smx_process_t (*smx_pfn_context_self_t) (void);
+typedef smx_context_t (*smx_pfn_context_self_t) (void);
+typedef void* (*smx_pfn_context_get_data_t) (smx_context_t context);
/* interface of the context factories */
typedef struct s_smx_context_factory {
+ const char *name;
smx_pfn_context_factory_create_context_t create_context;
smx_pfn_context_factory_finalize_t finalize;
smx_pfn_context_free_t free;
smx_pfn_context_suspend_t suspend;
smx_pfn_context_runall_t runall;
smx_pfn_context_self_t self;
- const char *name;
+ smx_pfn_context_get_data_t get_data;
} s_smx_context_factory_t;
void SIMIX_context_mod_init(void);
-
void SIMIX_context_mod_exit(void);
/* All factories init */
-void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory);
-void SIMIX_ctx_sysv_factory_init(smx_context_factory_t * factory);
+void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);
+void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory);
/* ****************************** */
/* context manipulation functions */
}
/**
- \brief returns the current running process
+ \brief returns the current running context
*/
-static XBT_INLINE smx_process_t SIMIX_context_self(void)
+static XBT_INLINE smx_context_t SIMIX_context_self(void)
{
if (simix_global->context_factory == NULL) {
return NULL;
return (*(simix_global->context_factory->self))();
}
+<<<<<<< HEAD
+/**
+ \brief returns the data associated to a context
+ \param context The context
+ \return The data
+ */
+static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
+{
+ return (*(simix_global->context_factory->get_data))(context);
+}
+
+=======
+>>>>>>> Clean indentation and coding style in SIMIX
#endif