From c836edd2518e98d7666b73277ced612cc526f3f4 Mon Sep 17 00:00:00 2001 From: thiery Date: Thu, 3 Feb 2011 18:39:39 +0000 Subject: [PATCH] Choose between parallel and serial dynamically only if needed git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9573 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/smx_context_raw.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index 3f21edd1e5..e829551d13 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -280,8 +280,7 @@ static int smx_ctx_raw_get_thread_id(){ static void smx_ctx_raw_runall(xbt_dynar_t processes) { - if (SIMIX_context_is_parallel() - && xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) { + if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) { DEBUG1("Runall // %lu", xbt_dynar_length(processes)); raw_factory->self = smx_ctx_raw_self_parallel; raw_factory->get_thread_id = smx_ctx_raw_get_thread_id; @@ -308,9 +307,25 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory) (*factory)->name = "smx_raw_context_factory"; parmap = xbt_parmap_new(2); - (*factory)->self = smx_ctx_raw_self_parallel; - (*factory)->get_thread_id = smx_ctx_raw_get_thread_id; - (*factory)->runall = smx_ctx_raw_runall; + + if (SIMIX_context_is_parallel()) { + if (SIMIX_context_get_parallel_threshold() > 1) { + /* choose dynamically */ + (*factory)->runall = smx_ctx_raw_runall; + } + else { + /* always parallel */ + (*factory)->self = smx_ctx_raw_self_parallel; + (*factory)->get_thread_id = smx_ctx_raw_get_thread_id; + (*factory)->runall = smx_ctx_raw_runall_parallel; + } + } + else { + /* always serial */ + (*factory)->self = smx_ctx_base_self; + (*factory)->get_thread_id = smx_ctx_base_get_thread_id; + (*factory)->runall = smx_ctx_raw_runall_serial; + } raw_factory = *factory; } -- 2.20.1