Remove unused functions from xbt_os_thread.

Functions: xbt_os_thread_cancel(), xbt_os_thread_detach(), _os_thread_ex_terminate().

diff --git a/ChangeLog b/ChangeLog
index fb9ae33..454827e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@ SimGrid (3.17) UNRELEASED (release target: September 22 2017)
  - Removed unused functions:
    - xbt/str.h: xbt_str_split_str(), xbt_str_subst(), xbt_str_ltrim(),
        xbt_str_rtrim(), xbt_str_trim().
  - Removed unused functions:
    - xbt/str.h: xbt_str_split_str(), xbt_str_subst(), xbt_str_ltrim(),
        xbt_str_rtrim(), xbt_str_trim().

+   - xbt/xbt_os_thread.h: xbt_os_thread_cancel(), xbt_os_thread_detach().

 
  Misc
  - Removed header files obsolete since SimGrid 3.12:
 
  Misc
  - Removed header files obsolete since SimGrid 3.12:

diff --git a/include/xbt/xbt_os_thread.h b/include/xbt/xbt_os_thread.h
index fa4c014..097d503 100644 (file)
--- a/include/xbt/xbt_os_thread.h
+++ b/include/xbt/xbt_os_thread.h
@@ -30,7 +30,6 @@ XBT_PUBLIC(int) xbt_os_get_numcores(void);
 typedef struct xbt_os_thread_ *xbt_os_thread_t;
 XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *data);
 XBT_PUBLIC(void) xbt_os_thread_exit(int *retcode);
 typedef struct xbt_os_thread_ *xbt_os_thread_t;
 XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *data);
 XBT_PUBLIC(void) xbt_os_thread_exit(int *retcode);

-XBT_PUBLIC(void) xbt_os_thread_detach(xbt_os_thread_t thread);

 
 XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_self(void);
 XBT_PUBLIC(const char *) xbt_os_thread_self_name(void);
 
 XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_self(void);
 XBT_PUBLIC(const char *) xbt_os_thread_self_name(void);


@@ -42,7 +41,6 @@ XBT_PUBLIC(void*) xbt_os_thread_get_specific(xbt_os_thread_key_t key);
   /* xbt_os_thread_join frees the joined thread (ie the XBT wrapper around it, the OS frees the rest) */
 XBT_PUBLIC(void) xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return);
 XBT_PUBLIC(void) xbt_os_thread_yield(void);
   /* xbt_os_thread_join frees the joined thread (ie the XBT wrapper around it, the OS frees the rest) */
 XBT_PUBLIC(void) xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return);
 XBT_PUBLIC(void) xbt_os_thread_yield(void);

-XBT_PUBLIC(void) xbt_os_thread_cancel(xbt_os_thread_t thread);

 XBT_PUBLIC(void) xbt_os_thread_setstacksize(int stack_size);
 XBT_PUBLIC(void) xbt_os_thread_setguardsize(int guard_size);
 XBT_PUBLIC(int) xbt_os_thread_bind(xbt_os_thread_t thread, int core);
 XBT_PUBLIC(void) xbt_os_thread_setstacksize(int stack_size);
 XBT_PUBLIC(void) xbt_os_thread_setguardsize(int guard_size);
 XBT_PUBLIC(int) xbt_os_thread_bind(xbt_os_thread_t thread, int core);

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 04a4978..2652bc9 100644 (file)
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -52,7 +52,6 @@ static xbt_os_mutex_t next_sem_ID_lock;
 
 typedef struct xbt_os_thread_ {
   pthread_t t;
 
 typedef struct xbt_os_thread_ {
   pthread_t t;

-  int detached;

   char *name;
   void *param;
   pvoid_f_pvoid_t start_routine;
   char *name;
   void *param;
   pvoid_f_pvoid_t start_routine;


@@ -77,14 +76,6 @@ static void xbt_os_thread_free_thread_data(xbt_os_thread_t thread)
   free(thread);
 }
 
   free(thread);
 }
 

-/* callback: termination */
-static void _os_thread_ex_terminate(xbt_ex_t * e)
-{
-  xbt_ex_display(e);
-  xbt_abort();
-  /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */
-}
-

 void xbt_os_thread_mod_preinit(void)
 {
   if (thread_mod_inited)
 void xbt_os_thread_mod_preinit(void)
 {
   if (thread_mod_inited)


@@ -95,7 +86,6 @@ void xbt_os_thread_mod_preinit(void)
 
   main_thread = xbt_new(s_xbt_os_thread_t, 1);
   main_thread->name = NULL;
 
   main_thread = xbt_new(s_xbt_os_thread_t, 1);
   main_thread->name = NULL;

-  main_thread->detached = 0;

   main_thread->name = xbt_strdup("main");
   main_thread->param = NULL;
   main_thread->start_routine = NULL;
   main_thread->name = xbt_strdup("main");
   main_thread->param = NULL;
   main_thread->start_routine = NULL;


@@ -151,16 +141,12 @@ static void *wrapper_start_routine(void *s)
   int errcode = pthread_setspecific(xbt_self_thread_key, t);
   xbt_assert(errcode == 0, "pthread_setspecific failed for xbt_self_thread_key");
 
   int errcode = pthread_setspecific(xbt_self_thread_key, t);
   xbt_assert(errcode == 0, "pthread_setspecific failed for xbt_self_thread_key");
 

-  void *res = t->start_routine(t->param);
-  if (t->detached)
-    xbt_os_thread_free_thread_data(t);
-  return res;
+  return t->start_routine(t->param);

 }
 
 xbt_os_thread_t xbt_os_thread_create(const char *name,  pvoid_f_pvoid_t start_routine, void *param, void *extra_data)
 {
   xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);
 }
 
 xbt_os_thread_t xbt_os_thread_create(const char *name,  pvoid_f_pvoid_t start_routine, void *param, void *extra_data)
 {
   xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);

-  res_thread->detached = 0;

   res_thread->name = xbt_strdup(name);
   res_thread->start_routine = start_routine;
   res_thread->param = param;
   res_thread->name = xbt_strdup(name);
   res_thread->start_routine = start_routine;
   res_thread->param = param;


@@ -276,23 +262,12 @@ void* xbt_os_thread_get_specific(xbt_os_thread_key_t key)
   return pthread_getspecific(key);
 }
 
   return pthread_getspecific(key);
 }
 

-void xbt_os_thread_detach(xbt_os_thread_t thread)
-{
-  thread->detached = 1;
-  pthread_detach(thread->t);
-}
-

 #include <sched.h>
 void xbt_os_thread_yield(void)
 {
   sched_yield();
 }
 
 #include <sched.h>
 void xbt_os_thread_yield(void)
 {
   sched_yield();
 }
 

-void xbt_os_thread_cancel(xbt_os_thread_t t)
-{
-  pthread_cancel(t->t);
-}
-

 /****** mutex related functions ******/
 typedef struct xbt_os_mutex_ {
   pthread_mutex_t m;
 /****** mutex related functions ******/
 typedef struct xbt_os_mutex_ {
   pthread_mutex_t m;