#include "xbt/parmap.h"
#include "smx_private.h"
-#include "gras_config.h"
+#include "internal_config.h"
#include "context_sysv_config.h" /* loads context system definitions */
#include "mc/mc.h"
#ifdef CONTEXT_THREADS
static xbt_parmap_t sysv_parmap;
-static ucontext_t* sysv_workers_stacks; /* space to save the worker's stack in each thread */
+static smx_ctx_sysv_t* sysv_workers_context; /* space to save the worker's context in each thread */
static unsigned long sysv_threads_working; /* number of threads that have started their work */
static xbt_os_thread_key_t sysv_worker_id_key; /* thread-specific storage for the thread id */
#endif
#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
int nthreads = SIMIX_context_get_nthreads();
sysv_parmap = xbt_parmap_new(nthreads, SIMIX_context_get_parallel_mode());
- sysv_workers_stacks = xbt_new(ucontext_t, nthreads);
+ sysv_workers_context = xbt_new(smx_ctx_sysv_t, nthreads);
+ sysv_maestro_context = NULL;
xbt_os_thread_key_create(&sysv_worker_id_key);
(*factory)->stop = smx_ctx_sysv_stop_parallel;
(*factory)->suspend = smx_ctx_sysv_suspend_parallel;
#ifdef CONTEXT_THREADS
if (sysv_parmap)
xbt_parmap_destroy(sysv_parmap);
- xbt_free(sysv_workers_stacks);
+ xbt_free(sysv_workers_context);
#endif
return smx_ctx_base_factory_finalize(factory);
}
sizeof(smx_ctx_sysv_t), sizeof(int), CTX_ADDR_LEN);
}
} else {
- sysv_maestro_context = context;
+ if(data != NULL && sysv_maestro_context == NULL)
+ sysv_maestro_context = context;
}
if(MC_is_active() && code)
- MC_new_stack_area(context, ((smx_process_t)((smx_context_t)context)->data)->name, &(context->uc));
+ MC_new_stack_area(context, ((smx_process_t)((smx_context_t)context)->data)->name, &(context->uc), size);
return (smx_context_t) context;
}
smx_context_t next_context;
unsigned long int i = sysv_process_index++;
- if(MC_is_active()){
- MC_ignore_stack("next_context", "smx_ctx_sysv_suspend_serial");
- MC_ignore_stack("i", "smx_ctx_sysv_suspend_serial");
- }
-
if (i < xbt_dynar_length(simix_global->process_to_run)) {
/* execute the next process */
XBT_DEBUG("Run next process");
else {
/* all processes were run, go to the barrier */
XBT_DEBUG("No more processes to run");
- next_context = (smx_context_t) sysv_maestro_context;
unsigned long worker_id =
(unsigned long) xbt_os_thread_get_specific(sysv_worker_id_key);
- next_stack = &sysv_workers_stacks[worker_id];
+ next_context = (smx_context_t)sysv_workers_context[worker_id];
+ next_stack = &((smx_ctx_sysv_t)next_context)->uc;
}
SIMIX_context_set_current(next_context);
#ifdef CONTEXT_THREADS
unsigned long worker_id = __sync_fetch_and_add(&sysv_threads_working, 1);
xbt_os_thread_set_specific(sysv_worker_id_key, (void*) worker_id);
- ucontext_t* worker_stack = &sysv_workers_stacks[worker_id];
+ smx_ctx_sysv_t worker_context = (smx_ctx_sysv_t)SIMIX_context_self();
+ sysv_workers_context[worker_id] = worker_context;
+ ucontext_t* worker_stack = &worker_context->uc;
smx_context_t context = first_process->context;
SIMIX_context_set_current(context);