From 174ff5d9a704689bdbeb8aaabe4557bcd96841c4 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 6 May 2011 10:19:29 +0200 Subject: [PATCH] Some more cleanup in smx_context_raw. Remove smx_ctx_raw_self_parallel which is the same as smx_ctx_base_self. Then the raw_factory static variable is not needed anymore. --- src/simix/smx_context_raw.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index 5ef8a000e9..e22ac1f2be 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -157,8 +157,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); static xbt_parmap_t parmap; #endif -static smx_context_factory_t raw_factory; - #ifdef TIME_BENCH #include "xbt/xbt_os_time.h" #define NUM_THREADS 4 @@ -357,20 +355,13 @@ static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes) #endif } -static smx_context_t smx_ctx_raw_self_parallel(void) -{ - return SIMIX_context_get_current(); -} - static void smx_ctx_raw_runall(xbt_dynar_t processes) { if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) { XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes)); - raw_factory->self = smx_ctx_raw_self_parallel; smx_ctx_raw_runall_parallel(processes); } else { XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes)); - raw_factory->self = smx_ctx_base_self; smx_ctx_raw_runall_serial(processes); } } @@ -398,16 +389,13 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory) } else { /* always parallel */ - (*factory)->self = smx_ctx_raw_self_parallel; (*factory)->runall = smx_ctx_raw_runall_parallel; } } else { /* always serial */ - (*factory)->self = smx_ctx_base_self; (*factory)->runall = smx_ctx_raw_runall_serial; } - raw_factory = *factory; #ifdef TIME_BENCH timer = xbt_os_timer_new(); #endif -- 2.20.1