Switch directly between runnable contextes (work in progress)

[simgrid.git] / include / simix / context.h

diff --git a/include/simix/context.h b/include/simix/context.h
index 712b07a..4b4d5b9 100644 (file)
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -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,10 +58,6 @@ extern smx_ctx_factory_initializer_t smx_factory_initializer_to_use;
 extern char* smx_context_factory_name;
 extern int smx_context_stack_size;
 
-#if defined(CONTEXT_THREADS) && !defined(APPLE)
-#define HAVE_THREAD_LOCAL_STORAGE 1
-#endif
-
 #ifdef HAVE_THREAD_LOCAL_STORAGE
 extern __thread smx_context_t smx_current_context;
 #else
@@ -101,7 +95,6 @@ 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 */
 XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads);