/* 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 "smx_context_sysv_private.h"
-#include "xbt/threadpool.h"
+#include "xbt/parmap.h"
+#include "simix/private.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <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)
+void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
{
smx_ctx_base_factory_init(factory);
(*factory)->name = "smx_sysv_context_factory";
if(_surf_parallel_contexts){
- tpool = xbt_tpool_new(2, 10);
+#ifdef CONTEXT_THREADS /* To use parallel ucontexts a thread pool is needed */
+ parmap = xbt_parmap_new(2);
(*factory)->runall = smx_ctx_sysv_runall_parallel;
+ (*factory)->self = smx_ctx_sysv_self_parallel;
+#else
+ THROW0(arg_error, 0, "No thread support for parallel context execution");
+#endif
}else{
(*factory)->runall = smx_ctx_sysv_runall;
}
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);
}
makecontext(&((smx_ctx_sysv_t) context)->uc, (void (*)())smx_ctx_sysv_wrapper,
sizeof(void*)/sizeof(int), context);
+ }else{
+ maestro_context = context;
}
return (smx_context_t) context;
void smx_ctx_sysv_stop(smx_context_t context)
{
smx_ctx_base_stop(context);
-
smx_ctx_sysv_suspend(context);
}
void smx_ctx_sysv_suspend(smx_context_t context)
{
- ucontext_t maestro_ctx =
- ((smx_ctx_sysv_t) simix_global->maestro_process->context)->uc;
-
- int rv = swapcontext(&((smx_ctx_sysv_t) context)->uc, &maestro_ctx);
+ smx_current_context = (smx_context_t)maestro_context;
+ 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 new_context)
+void smx_ctx_sysv_resume(smx_context_t context)
{
- smx_ctx_sysv_t maestro =
- (smx_ctx_sysv_t) simix_global->maestro_process->context;
-
- int rv =
- swapcontext(&(maestro->uc), &((smx_ctx_sysv_t) new_context)->uc);
+ smx_current_context = context;
+ 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_context_t old_context;
smx_process_t process;
- while((process = xbt_swag_extract(processes))){
- old_context = smx_current_context;
- smx_current_context = process->context;
- smx_ctx_sysv_resume(smx_current_context);
- smx_current_context = old_context;
+ while (xbt_dynar_length(processes)){
+ process = xbt_dynar_pop_as(processes,smx_process_t);
+ smx_ctx_sysv_resume(process->context);
}
}
-void smx_ctx_sysv_runall_parallel(xbt_swag_t processes)
+void smx_ctx_sysv_resume_parallel(smx_process_t process)
{
- smx_process_t process;
- while((process = xbt_swag_extract(processes))){
- xbt_tpool_queue_job(tpool, (void_f_pvoid_t)smx_ctx_sysv_resume, process->context);
- }
-}
\ No newline at end of file
+ smx_context_t context = process->context;
+ xbt_os_thread_set_extra_data(context);
+ 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_dynar_t processes)
+{
+ 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)
+{
+ smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data();
+ return self_context ? self_context : (smx_context_t) maestro_context;
+}