s_smx_ctx_base_t super; /* Fields of super implementation */
char *malloced_stack; /* malloced area containing the stack */
raw_stack_t stack_top; /* pointer to stack top (within previous area) */
+ raw_stack_t old_stack_top; /* to whom I should return the control */
#ifdef HAVE_VALGRIND_VALGRIND_H
unsigned int valgrind_stack_id; /* the valgrind stack id */
#endif
} s_smx_ctx_raw_t, *smx_ctx_raw_t;
-smx_ctx_raw_t maestro_context;
+smx_ctx_raw_t maestro_raw_context;
extern raw_stack_t raw_makecontext(char* malloced_stack, int stack_size,
rawctx_entry_point_t entry_point, void* arg);
-extern void raw_swapcontext(raw_stack_t* old, raw_stack_t* new);
+extern void raw_swapcontext(raw_stack_t* old, raw_stack_t new);
#ifdef PROCESSOR_i686
__asm__ (
" pushl %esi\n"
" pushl %edi\n"
" movl %esp,(%eax)\n"
- " movl (%edx),%esp\n"
+ " movl %edx,%esp\n"
" popl %edi\n"
" popl %esi\n"
" popl %ebx\n"
" pushq %r14\n"
" pushq %r15\n"
" movq %rsp,(%rdi)\n" /* old */
- " movq (%rsi),%rsp\n" /* new */
+ " movq %rsi,%rsp\n" /* new */
" popq %r15\n"
" popq %r14\n"
" popq %r13\n"
THROW_UNIMPLEMENTED;
}
-void raw_swapcontext(raw_stack_t* old, raw_stack_t* new) {
+void raw_swapcontext(raw_stack_t* old, raw_stack_t new) {
THROW_UNIMPLEMENTED;
}
#endif /* HAVE_VALGRIND_VALGRIND_H */
}else{
- maestro_context = context;
+ maestro_raw_context = context;
}
return (smx_context_t) context;
static void smx_ctx_raw_suspend(smx_context_t context)
{
- smx_current_context = (smx_context_t)maestro_context;
- raw_swapcontext(&((smx_ctx_raw_t) context)->stack_top, &maestro_context->stack_top);
+ smx_current_context = (smx_context_t)maestro_raw_context;
+ raw_swapcontext(
+ &((smx_ctx_raw_t) context)->stack_top,
+ ((smx_ctx_raw_t) context)->old_stack_top);
}
static void smx_ctx_raw_stop(smx_context_t context)
static void smx_ctx_raw_resume(smx_context_t context)
{
smx_current_context = context;
- raw_swapcontext(&maestro_context->stack_top, &((smx_ctx_raw_t) context)->stack_top);
+ raw_swapcontext(
+ &((smx_ctx_raw_t) context)->old_stack_top,
+ ((smx_ctx_raw_t) context)->stack_top);
}
static void smx_ctx_raw_runall(xbt_swag_t processes)
static void smx_ctx_raw_resume_parallel(smx_context_t context)
{
xbt_os_thread_set_extra_data(context);
- raw_swapcontext(&maestro_context->stack_top, &((smx_ctx_raw_t) context)->stack_top);
+ raw_swapcontext(
+ &((smx_ctx_raw_t) context)->old_stack_top,
+ ((smx_ctx_raw_t) context)->stack_top);
+ xbt_os_thread_set_extra_data(NULL);
}
static void smx_ctx_raw_runall_parallel(xbt_swag_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_context;
+ return self_context ? self_context : (smx_context_t) maestro_raw_context;
}
void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
{
+ INFO0("Using raw contexts. Because the glibc is just not good enough for us.");
smx_ctx_base_factory_init(factory);
(*factory)->finalize = smx_ctx_raw_factory_finalize;