X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d747238ce054a5db96974c9b2c888f922505f93b..f4e1c8752e7100a06bec488f150eff25d928ca34:/include/simix/context.h

diff --git a/include/simix/context.h b/include/simix/context.h
index 9d8ea2e8b6..4b4d5b9eb3 100644
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -11,7 +11,7 @@
 
 #include "xbt/swag.h"
 #include "simix/datatypes.h"
-#include "gras_config.h"
+#include "simgrid_config.h"
 
 SG_BEGIN_DECL()
 /******************************** Context *************************************/
@@ -33,10 +33,9 @@ typedef void (*smx_pfn_context_free_t) (smx_context_t);
 typedef void (*smx_pfn_context_start_t) (smx_context_t);
 typedef void (*smx_pfn_context_stop_t) (smx_context_t);
 typedef void (*smx_pfn_context_suspend_t) (smx_context_t context);
-typedef void (*smx_pfn_context_runall_t) (xbt_dynar_t processes);
+typedef void (*smx_pfn_context_runall_t) (void);
 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 {
@@ -49,7 +48,6 @@ 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;
 
 
@@ -60,7 +58,7 @@ 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
+#ifdef HAVE_THREAD_LOCAL_STORAGE
 extern __thread smx_context_t smx_current_context;
 #else
 extern smx_context_t smx_current_context;
@@ -72,7 +70,7 @@ extern smx_context_t smx_current_context;
 /* the following function pointers types describe the interface that all context
    concepts must implement */
 /* each context type derive from this structure, so they must contain this structure
- * at their begining -- OOP in C :/ */
+ * at their beginning -- OOP in C :/ */
 typedef struct s_smx_context {
   s_xbt_swag_hookup_t hookup;
   xbt_main_func_t code;
@@ -97,12 +95,13 @@ 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_nthreads(int nb_threads);
-int SIMIX_context_get_nthreads(void);
-int SIMIX_context_is_parallel(void);
+XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads);
+XBT_INLINE int SIMIX_context_get_nthreads(void);
+XBT_INLINE int SIMIX_context_is_parallel(void);
+XBT_INLINE void SIMIX_context_set_parallel_threshold(int threshold);
+XBT_INLINE int SIMIX_context_get_parallel_threshold(void);
 
 SG_END_DECL()