X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29202b3071fe6d3b7146dcd47218ab699ece7a62..1d86c2a6dd868b8634423c5f1be55b992709fc75:/include/simix/context.h

diff --git a/include/simix/context.h b/include/simix/context.h
index 0ba2a6c1d5..9d8ea2e8b6 100644
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -11,6 +11,7 @@
 
 #include "xbt/swag.h"
 #include "simix/datatypes.h"
+#include "gras_config.h"
 
 SG_BEGIN_DECL()
 /******************************** Context *************************************/
@@ -35,6 +36,7 @@ typedef void (*smx_pfn_context_suspend_t) (smx_context_t context);
 typedef void (*smx_pfn_context_runall_t) (xbt_dynar_t processes);
 typedef smx_context_t (*smx_pfn_context_self_t) (void);
 typedef void* (*smx_pfn_context_get_data_t) (smx_context_t context);
+typedef int (*smx_pfn_context_get_thread_id) (void);
 
 /* interface of the context factories */
 typedef struct s_smx_context_factory {
@@ -47,6 +49,7 @@ typedef struct s_smx_context_factory {
   smx_pfn_context_runall_t runall;
   smx_pfn_context_self_t self;
   smx_pfn_context_get_data_t get_data;
+  smx_pfn_context_get_thread_id get_thread_id;
 } s_smx_context_factory_t;
 
 
@@ -56,7 +59,12 @@ typedef void (*smx_ctx_factory_initializer_t)(smx_context_factory_t*);
 extern smx_ctx_factory_initializer_t smx_factory_initializer_to_use;
 extern char* smx_context_factory_name;
 extern int smx_context_stack_size;
+
+#ifdef CONTEXT_THREADS
+extern __thread smx_context_t smx_current_context;
+#else
 extern smx_context_t smx_current_context;
+#endif
 
 /* *********************** */
 /* Context type definition */
@@ -89,10 +97,11 @@ void smx_ctx_base_free(smx_context_t context);
 void smx_ctx_base_stop(smx_context_t context);
 smx_context_t smx_ctx_base_self(void);
 void *smx_ctx_base_get_data(smx_context_t context);
+int smx_ctx_base_get_thread_id(void);
 
 /* parallelism */
-void SIMIX_context_set_parallel_threads(int nb_threads);
-int SIMIX_context_get_parallel_threads(void);
+void SIMIX_context_set_nthreads(int nb_threads);
+int SIMIX_context_get_nthreads(void);
 int SIMIX_context_is_parallel(void);
 
 SG_END_DECL()