From c9c23fbcad8829230381279f08b72d22c82c7d20 Mon Sep 17 00:00:00 2001 From: Pierre Date: Thu, 5 Jan 2012 12:41:20 +0100 Subject: [PATCH 1/1] Use xbt_config mechanism instead of hard coding value. --- src/simix/smx_context.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c index c3632ff5b4..fed8f7fe3f 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -29,7 +29,6 @@ static xbt_os_thread_key_t smx_current_context_key = 0; static smx_context_t smx_current_context_serial; static int smx_parallel_contexts = 1; static int smx_parallel_threshold = 2; -static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_FUTEX; /** * This function is called by SIMIX_global_init() to initialize the context module. @@ -182,7 +181,22 @@ XBT_INLINE void SIMIX_context_set_parallel_threshold(int threshold) { * \return how threads are synchronized if processes are run in parallel */ XBT_INLINE e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void) { - return smx_parallel_synchronization_mode; + e_xbt_parmap_mode_t mode = XBT_PARMAP_FUTEX; + const char* mode_name = xbt_cfg_get_string(_surf_cfg_set, "contexts/synchro"); + if (!strcmp(mode_name, "posix")) { + mode = XBT_PARMAP_POSIX; + } + else if (!strcmp(mode_name, "futex")) { + mode = XBT_PARMAP_FUTEX; + } + else if (!strcmp(mode_name, "busy_wait")) { + mode = XBT_PARMAP_BUSY_WAIT; + } + else { + XBT_WARN("Command line setting of the parallel synchronization mode should " + "be one of \"posix\", \"futex\" or \"busy_wait\""); + } + return mode; } /** @@ -191,7 +205,19 @@ XBT_INLINE e_xbt_parmap_mode_t SIMIX_context_get_parallel_mode(void) { * \param mode how to synchronize threads if processes are run in parallel */ XBT_INLINE void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) { - smx_parallel_synchronization_mode = mode; + if (mode == XBT_PARMAP_POSIX) { + xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "posix"); + } + else if (mode == XBT_PARMAP_FUTEX) { + xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "futex"); + } + else if (XBT_PARMAP_BUSY_WAIT) { + xbt_cfg_set_string(_surf_cfg_set, "contexts/synchro", "busy_wait"); + } + else { + XBT_WARN("Command line setting of the parallel synchronization mode should " + "be one of \"posix\", \"futex\" or \"busy_wait\""); + } } /** -- 2.20.1