/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "xbt/threadpool.h"
#include "simix/private.h"
+#include "xbt/parmap.h"
+
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
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__ (
+ ".text\n"
".globl raw_makecontext\n"
+ ".type raw_makecontext,@function\n"
"raw_makecontext:\n"
" movl 4(%esp),%eax\n" /* stack */
" addl 8(%esp),%eax\n" /* size */
);
__asm__ (
+ ".text\n"
".globl raw_swapcontext\n"
+ ".type raw_swapcontext,@function\n"
"raw_swapcontext:\n"
" movl 4(%esp),%eax\n" /* old */
" movl 8(%esp),%edx\n" /* new */
" 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"
);
#elif PROCESSOR_x86_64
__asm__ (
+ ".text\n"
".globl raw_makecontext\n"
+ ".type raw_makecontext,@function\n"
"raw_makecontext:\n" /* Calling convention sets the arguments in rdi, rsi, rdx and rcx, respectively */
" movq %rdi,%rax\n" /* stack */
" addq %rsi,%rax\n" /* size */
);
__asm__ (
+ ".text\n"
".globl raw_swapcontext\n"
+ ".type raw_swapcontext,@function\n"
"raw_swapcontext:\n" /* Calling convention sets the arguments in rdi and rsi, respectively */
" pushq %rdi\n"
" pushq %rsi\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;
}
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
-static xbt_tpool_t tpool;
+static xbt_parmap_t parmap;
static void smx_ctx_raw_wrapper(smx_ctx_raw_t context);
-
static int smx_ctx_raw_factory_finalize(smx_context_factory_t *factory)
{
- if(tpool)
- xbt_tpool_destroy(tpool);
+ if(parmap)
+ xbt_parmap_destroy(parmap);
return smx_ctx_base_factory_finalize(factory);
}
#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_runall(xbt_dynar_t processes)
{
smx_process_t process;
+ unsigned int cursor;
- while ((process = xbt_swag_extract(processes)))
+ xbt_dynar_foreach(processes, cursor, process) {
+ DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
smx_ctx_raw_resume(process->context);
+ }
+ xbt_dynar_reset(processes);
}
-static void smx_ctx_raw_resume_parallel(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);
- raw_swapcontext(&maestro_context->stack_top, &((smx_ctx_raw_t) context)->stack_top);
+ raw_swapcontext(
+ &context->old_stack_top,
+ context->stack_top);
+ xbt_os_thread_set_extra_data(NULL);
}
-static void smx_ctx_raw_runall_parallel(xbt_swag_t processes)
+static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
{
- smx_process_t process;
- while((process = xbt_swag_extract(processes))){
- xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, process->context);
- }
- xbt_tpool_wait_all(tpool);
+ xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_raw_resume_parallel, processes);
+ xbt_dynar_reset(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)
{
+ VERB0("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;
if(_surf_parallel_contexts){
#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
- tpool = xbt_tpool_new(2, 10);
+ parmap = xbt_parmap_new(2);
(*factory)->runall = smx_ctx_raw_runall_parallel;
(*factory)->self = smx_ctx_raw_self_parallel;
#else
