X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec86e827d8bb67988913e0658155b2fa4fbd7ac6..dbfa5606c9912e09908b3343ec7a56b283ec82b9:/src/simix/smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 9515444091..2da152b007 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,6 +11,7 @@
 #include "xbt/swag.h"
 #include "private.h"
 #include "simix/context.h"
+#include "gras_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mecanism");
@@ -18,8 +19,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=contexts/factory:value */
 smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
 int smx_context_stack_size = 128 * 1024;
+
+#ifdef CONTEXT_THREADS
+__thread smx_context_t smx_current_context;
+#else
 smx_context_t smx_current_context;
-static int smx_parallel_contexts;
+#endif
+
+static int smx_parallel_contexts = 1;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.
@@ -87,7 +94,7 @@ void SIMIX_context_set_nthreads(int nb_threads) {
  * for the user contexts.
  * \return the number of threads (1 means no parallelism)
  */
-int SIMIX_context_get_nthreads() {
+int SIMIX_context_get_nthreads(void) {
   return smx_parallel_contexts;
 }
 
@@ -96,7 +103,7 @@ int SIMIX_context_get_nthreads() {
  * for the user contexts.
  * \return 1 if parallelism is used
  */
-int SIMIX_context_is_parallel() {
+int SIMIX_context_is_parallel(void) {
   return smx_parallel_contexts > 1;
 }