From d98cdc629ec5f6d20e852a7ede11ac44fa843e9d Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 5 Jan 2019 01:08:40 +0100 Subject: [PATCH] another small simplification now that threads are usable everywhere --- src/simix/smx_context.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index 8326069dee..4f65ca70cb 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -67,8 +67,7 @@ unsigned smx_context_stack_size; int smx_context_stack_size_was_set = 0; unsigned smx_context_guard_size; int smx_context_guard_size_was_set = 0; -static thread_local smx_context_t smx_current_context_parallel; -static smx_context_t smx_current_context_serial; +static thread_local smx_context_t smx_current_context; static int smx_parallel_contexts = 1; static int smx_parallel_threshold = 2; static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT; @@ -302,12 +301,7 @@ void SIMIX_context_set_parallel_mode(e_xbt_parmap_mode_t mode) { */ smx_context_t SIMIX_context_get_current() { - if (SIMIX_context_is_parallel()) { - return smx_current_context_parallel; - } - else { - return smx_current_context_serial; - } + return smx_current_context; } /** @@ -316,10 +310,5 @@ smx_context_t SIMIX_context_get_current() */ void SIMIX_context_set_current(smx_context_t context) { - if (SIMIX_context_is_parallel()) { - smx_current_context_parallel = context; - } - else { - smx_current_context_serial = context; - } + smx_current_context = context; } -- 2.20.1