XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
-static xbt_parmap_t parmap;
-
#ifdef CONTEXT_THREADS
-static __thread smx_context_t current_context;
+static xbt_parmap_t parmap;
#endif
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
}else{
maestro_raw_context = context;
- current_context = (smx_context_t) maestro_raw_context;
}
return (smx_context_t) context;
static void smx_ctx_raw_resume_parallel(smx_process_t process)
{
smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
- /*xbt_os_thread_set_extra_data(context);*/
- current_context = (smx_context_t)context;
+ smx_current_context = (smx_context_t)context;
raw_swapcontext(
&context->old_stack_top,
context->stack_top);
- current_context = (smx_context_t)maestro_raw_context;
- /*xbt_os_thread_set_extra_data(NULL);*/
+ smx_current_context = (smx_context_t)maestro_raw_context;
}
static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
static smx_context_t smx_ctx_raw_self_parallel(void)
{
- /*smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data();
- return self_context ? self_context : (smx_context_t) maestro_raw_context;*/
- return current_context;
+ return smx_current_context;
+}
+
+static int smx_ctx_raw_get_thread_id(){
+ return (int)(unsigned long)xbt_os_thread_get_extra_data();
}
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
(*factory)->suspend = smx_ctx_raw_suspend;
(*factory)->name = "smx_raw_context_factory";
- if (smx_parallel_contexts) {
+ if (SIMIX_context_is_parallel()) {
#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
parmap = xbt_parmap_new(2);
(*factory)->runall = smx_ctx_raw_runall_parallel;
(*factory)->self = smx_ctx_raw_self_parallel;
+ (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
#else
THROW0(arg_error, 0, "No thread support for parallel context execution");
#endif
- }else{
+ } else {
(*factory)->runall = smx_ctx_raw_runall;
}
}