* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_context_sysv_private.h"
-#include "xbt/threadpool.h"
+#include "xbt/parmap.h"
#include "simix/private.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
-static xbt_tpool_t tpool;
+static xbt_parmap_t parmap;
static smx_context_t
smx_ctx_sysv_create_context(xbt_main_func_t code, int argc, char **argv,
void_pfn_smxprocess_t cleanup_func, void* data);
-
static void smx_ctx_sysv_wrapper(smx_ctx_sysv_t context);
void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
{
smx_ctx_base_factory_init(factory);
+ VERB0("Activating SYSV context factory");
(*factory)->finalize = smx_ctx_sysv_factory_finalize;
(*factory)->create_context = smx_ctx_sysv_create_context;
(*factory)->suspend = smx_ctx_sysv_suspend;
(*factory)->name = "smx_sysv_context_factory";
- if(_surf_parallel_contexts){
+ if (smx_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_sysv_runall_parallel;
(*factory)->self = smx_ctx_sysv_self_parallel;
#else
int smx_ctx_sysv_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);
}
void smx_ctx_sysv_suspend(smx_context_t context)
{
smx_current_context = (smx_context_t)maestro_context;
- int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_context->uc);
+ int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &((smx_ctx_sysv_t)context)->old_uc);
xbt_assert0((rv == 0), "Context swapping failure");
}
void smx_ctx_sysv_resume(smx_context_t context)
{
smx_current_context = context;
- int rv = swapcontext(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc);
+ int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
xbt_assert0((rv == 0), "Context swapping failure");
}
-void smx_ctx_sysv_runall(xbt_swag_t processes)
+void smx_ctx_sysv_runall(xbt_dynar_t processes)
{
smx_process_t process;
-
- while ((process = xbt_swag_extract(processes)))
+ unsigned int cursor;
+
+ xbt_dynar_foreach(processes, cursor, process) {
+ DEBUG2("Schedule item %u of %lu",cursor,xbt_dynar_length(processes));
smx_ctx_sysv_resume(process->context);
+ }
+ xbt_dynar_reset(processes);
}
-void smx_ctx_sysv_resume_parallel(smx_context_t context)
+void smx_ctx_sysv_resume_parallel(smx_process_t process)
{
+ smx_context_t context = process->context;
xbt_os_thread_set_extra_data(context);
- int rv = swapcontext(&maestro_context->uc, &((smx_ctx_sysv_t) context)->uc);
+ int rv = swapcontext(&((smx_ctx_sysv_t)context)->old_uc, &((smx_ctx_sysv_t) context)->uc);
+ xbt_os_thread_set_extra_data(NULL);
xbt_assert0((rv == 0), "Context swapping failure");
}
-void smx_ctx_sysv_runall_parallel(xbt_swag_t processes)
+void smx_ctx_sysv_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_sysv_resume_parallel, process->context);
- }
+ xbt_parmap_apply(parmap, (void_f_pvoid_t)smx_ctx_sysv_resume_parallel, processes);
+ xbt_dynar_reset(processes);
}
smx_context_t smx_ctx_sysv_self_parallel(void)