-Add smx_ctx_sysv_get_thread_id to the parallel ucontext factory.

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index c2bf12d..6030548 100644 (file)
--- 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.
@@ -76,7 +83,7 @@ void SIMIX_context_mod_exit(void)
  *
  * \param nb_threads the number of threads to use
  */
-void SIMIX_context_set_parallel_threads(int nb_threads) {
+void SIMIX_context_set_nthreads(int nb_threads) {
 
   xbt_assert1(nb_threads > 0, "Invalid number of parallel threads: %d", nb_threads);
   smx_parallel_contexts = nb_threads;
@@ -87,7 +94,7 @@ void SIMIX_context_set_parallel_threads(int nb_threads) {
  * for the user contexts.
  * \return the number of threads (1 means no parallelism)
  */
-int SIMIX_context_get_parallel_threads() {
+int SIMIX_context_get_nthreads() {
   return smx_parallel_contexts;
 }