- Add SIMIX_context_get_thread_id to the context factory interface.

- Implement a default base function for it.
- Implement a raw context version for use with // threads.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9548 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/simix/context.h b/include/simix/context.h
index e51262d..7775c66 100644 (file)
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -35,6 +35,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 +48,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;
 
 
@@ -89,6 +91,7 @@ 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);

diff --git a/src/simix/private.h b/src/simix/private.h
index 1991733..5aadc79 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -258,5 +258,14 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
   return (*(simix_global->context_factory->get_data))(context);
 }
 
+/**
+ \brief returns the thread's pid running the current context
+ \return The pid
+ */
+static XBT_INLINE int SIMIX_context_get_thread_id(void)
+{
+  return (*(simix_global->context_factory->get_thread_id))();
+}
+
 XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
 #endif

diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c
index 64b965f..5403bd8 100644 (file)
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -25,6 +25,7 @@ void smx_ctx_base_factory_init(smx_context_factory_t *factory)
   (*factory)->runall = NULL;
   (*factory)->self = smx_ctx_base_self;
   (*factory)->get_data = smx_ctx_base_get_data;
+  (*factory)->get_thread_id = smx_ctx_base_get_thread_id;
 
   (*factory)->name = "base context factory";
 }
@@ -96,3 +97,8 @@ void *smx_ctx_base_get_data(smx_context_t context)
 {
   return context->data;
 }
+
+int smx_ctx_base_get_thread_id()
+{
+  return 0;
+}

diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c
index ffd2bdf..2d62d5d 100644 (file)
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.c
@@ -265,13 +265,11 @@ static void smx_ctx_raw_runall(xbt_dynar_t processes)
 static void smx_ctx_raw_resume_parallel(smx_process_t process)
 {
   smx_ctx_raw_t context = (smx_ctx_raw_t)process->context;
-  /*xbt_os_thread_set_extra_data(context);*/
   current_context = (smx_context_t)context;
   raw_swapcontext(
       &context->old_stack_top,
       context->stack_top);
   current_context = (smx_context_t)maestro_raw_context;
-  /*xbt_os_thread_set_extra_data(NULL);*/
 }
 
 static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
@@ -282,11 +280,13 @@ static void smx_ctx_raw_runall_parallel(xbt_dynar_t processes)
 
 static smx_context_t smx_ctx_raw_self_parallel(void)
 {
-  /*smx_context_t self_context = (smx_context_t) xbt_os_thread_get_extra_data();
-  return self_context ? self_context : (smx_context_t) maestro_raw_context;*/
   return current_context;
 }
 
+static int smx_ctx_raw_get_thread_id(){
+  return (int)(unsigned long)xbt_os_thread_get_extra_data();
+}
+
 void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
 {
   VERB0("Using raw contexts. Because the glibc is just not good enough for us.");
@@ -305,6 +305,7 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
     parmap = xbt_parmap_new(2);
     (*factory)->runall = smx_ctx_raw_runall_parallel;
     (*factory)->self = smx_ctx_raw_self_parallel;
+    (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;
 #else
     THROW0(arg_error, 0, "No thread support for parallel context execution");
 #endif