Remove the get_thread_id field from context_factory.

It is now unused.

diff --git a/include/simix/context.h b/include/simix/context.h
index 1cc8dd4..98512e2 100644 (file)
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -36,7 +36,6 @@ 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 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 {
 
 /* 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_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;
 
 
 } s_smx_context_factory_t;
 
 


@@ -97,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);
 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);
 
 /* parallelism */
 XBT_INLINE void SIMIX_context_set_nthreads(int nb_threads);

diff --git a/src/simix/private.h b/src/simix/private.h
index 874f4b4..7b2d98c 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -261,14 +261,5 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
   return (*(simix_global->context_factory->get_data))(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
 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 85b24fe..810ef6c 100644 (file)
--- a/src/simix/smx_context_base.c
+++ b/src/simix/smx_context_base.c
@@ -27,7 +27,6 @@ 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)->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";
 }
 
   (*factory)->name = "base context factory";
 }


@@ -101,8 +100,3 @@ void *smx_ctx_base_get_data(smx_context_t context)
 {
   return context->data;
 }
 {
   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 28f7831..5ef8a00 100644 (file)
--- a/src/simix/smx_context_raw.c
+++ b/src/simix/smx_context_raw.c
@@ -362,21 +362,15 @@ static smx_context_t smx_ctx_raw_self_parallel(void)
   return SIMIX_context_get_current();
 }
 
   return SIMIX_context_get_current();
 }
 

-static int smx_ctx_raw_get_thread_id(){
-  return (int)(unsigned long)xbt_os_thread_get_extra_data();
-}
-

 static void smx_ctx_raw_runall(xbt_dynar_t processes)
 {
   if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
     XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes));
     raw_factory->self = smx_ctx_raw_self_parallel;
 static void smx_ctx_raw_runall(xbt_dynar_t processes)
 {
   if (xbt_dynar_length(processes) >= SIMIX_context_get_parallel_threshold()) {
     XBT_DEBUG("Runall // %lu", xbt_dynar_length(processes));
     raw_factory->self = smx_ctx_raw_self_parallel;

-    raw_factory->get_thread_id = smx_ctx_raw_get_thread_id;

     smx_ctx_raw_runall_parallel(processes);
   } else {
     XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes));
     raw_factory->self = smx_ctx_base_self;
     smx_ctx_raw_runall_parallel(processes);
   } else {
     XBT_DEBUG("Runall serial %lu", xbt_dynar_length(processes));
     raw_factory->self = smx_ctx_base_self;

-    raw_factory->get_thread_id = smx_ctx_base_get_thread_id;

     smx_ctx_raw_runall_serial(processes);
   }
 }
     smx_ctx_raw_runall_serial(processes);
   }
 }


@@ -405,14 +399,12 @@ void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory)
     else {
       /* always parallel */
       (*factory)->self = smx_ctx_raw_self_parallel;
     else {
       /* always parallel */
       (*factory)->self = smx_ctx_raw_self_parallel;

-      (*factory)->get_thread_id = smx_ctx_raw_get_thread_id;

       (*factory)->runall = smx_ctx_raw_runall_parallel;
     }
   }
   else {
     /* always serial */
     (*factory)->self = smx_ctx_base_self;
       (*factory)->runall = smx_ctx_raw_runall_parallel;
     }
   }
   else {
     /* always serial */
     (*factory)->self = smx_ctx_base_self;

-    (*factory)->get_thread_id = smx_ctx_base_get_thread_id;

     (*factory)->runall = smx_ctx_raw_runall_serial;
   }
   raw_factory = *factory;
     (*factory)->runall = smx_ctx_raw_runall_serial;
   }
   raw_factory = *factory;

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index caa6d45..4d30329 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -68,7 +68,6 @@ void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory)
     parmap = xbt_parmap_new(2);
     (*factory)->runall = smx_ctx_sysv_runall_parallel;
     (*factory)->self = smx_ctx_sysv_self_parallel;
     parmap = xbt_parmap_new(2);
     (*factory)->runall = smx_ctx_sysv_runall_parallel;
     (*factory)->self = smx_ctx_sysv_self_parallel;

-    (*factory)->get_thread_id = smx_ctx_sysv_get_thread_id;

 #else
     THROWF(arg_error, 0, "No thread support for parallel context execution");
 #endif
 #else
     THROWF(arg_error, 0, "No thread support for parallel context execution");
 #endif


@@ -241,8 +240,3 @@ smx_context_t smx_ctx_sysv_self_parallel(void)
   return self_context ? self_context : (smx_context_t) maestro_context;*/
   return SIMIX_context_get_current();
 }
   return self_context ? self_context : (smx_context_t) maestro_context;*/
   return SIMIX_context_get_current();
 }

-
-int smx_ctx_sysv_get_thread_id(void)
-{
-  return (int)(unsigned long)xbt_os_thread_get_extra_data();
-}