Bug#16301715 REMOVE DEAD CODE DEFINED WITH DONT_USE_THR_ALARM

Description: Dead code defined under DONT_USE_THR_ALARM, 
HAVE_rts_threads are removed. Also removed USE_ALARM_THREAD 
which is defined only for HAVE_rts_threads

Author: prabakaran thirumalai

include/my_pthread.h

@@ -189,11 +189,6 @@ int pthread_cancel(pthread_t thread);
 
 #else /* Normal threads */
 
-#ifdef HAVE_rts_threads
-#define sigwait org_sigwait
-#include <signal.h>
-#undef sigwait
-#endif
 #include <pthread.h>
 #ifndef _REENTRANT
 #define _REENTRANT
@@ -223,18 +218,6 @@ typedef void *(* pthread_handler)(void *);
 #endif
 #define my_pthread_once(C,F) pthread_once(C,F)
 
-/* Test first for RTS or FSU threads */
-
-#if defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM)
-#define HAVE_rts_threads
-extern int my_pthread_create_detached;
-#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
-#define PTHREAD_CREATE_DETACHED &my_pthread_create_detached
-#define PTHREAD_SCOPE_SYSTEM  PTHREAD_SCOPE_GLOBAL
-#define PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_LOCAL
-#define USE_ALARM_THREAD
-#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
-
 #if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910
 int sigwait(sigset_t *set, int *sig);
 #endif
@@ -260,7 +243,7 @@ extern int my_pthread_cond_init(pthread_cond_t *mp,
 #define pthread_sigmask(A,B,C) sigthreadmask((A),(B),(C))
 #endif
 
-#if !defined(HAVE_SIGWAIT) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
+#if !defined(HAVE_SIGWAIT) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
 int sigwait(sigset_t *setp, int *sigp);		/* Use our implemention */
 #endif
 

include/thr_alarm.h

@@ -21,16 +21,8 @@
 extern "C" {
 #endif
 
-#ifndef USE_ALARM_THREAD
 #define USE_ONE_SIGNAL_HAND		/* One must call process_alarm */
-#endif
-#ifdef HAVE_rts_threads
-#undef USE_ONE_SIGNAL_HAND
-#define USE_ALARM_THREAD
-#define THR_SERVER_ALARM SIGUSR1
-#else
 #define THR_SERVER_ALARM SIGALRM
-#endif
 
 typedef struct st_alarm_info
 {
@@ -41,26 +33,6 @@ typedef struct st_alarm_info
 
 void thr_alarm_info(ALARM_INFO *info);
 
-#if defined(DONT_USE_THR_ALARM)
-
-#define USE_ALARM_THREAD
-#undef USE_ONE_SIGNAL_HAND
-
-typedef my_bool thr_alarm_t;
-typedef my_bool ALARM;
-
-#define thr_alarm_init(A) (*(A))=0
-#define thr_alarm_in_use(A) (*(A) != 0)
-#define thr_end_alarm(A)
-#define thr_alarm(A,B,C) ((*(A)=1)-1)
-/* The following should maybe be (*(A)) */
-#define thr_got_alarm(A) 0
-#define init_thr_alarm(A)
-#define thr_alarm_kill(A)
-#define resize_thr_alarm(N)
-#define end_thr_alarm(A)
-
-#else
 #if defined(__WIN__)
 typedef struct st_thr_alarm_entry
 {
@@ -101,9 +73,6 @@ sig_handler process_alarm(int);
 my_bool thr_got_alarm(thr_alarm_t *alrm);
 #endif
 
-
-#endif /* DONT_USE_THR_ALARM */
-
 #ifdef	__cplusplus
 }
 #endif /* __cplusplus */

mysys/my_init.c

@@ -513,15 +513,6 @@ static PSI_cond_info all_mysys_conds[]=
   { &key_THR_COND_threads, "THR_COND_threads", 0}
 };
 
-#ifdef USE_ALARM_THREAD
-PSI_thread_key key_thread_alarm;
-
-static PSI_thread_info all_mysys_threads[]=
-{
-  { &key_thread_alarm, "alarm", PSI_FLAG_GLOBAL}
-};
-#endif /* USE_ALARM_THREAD */
-
 #ifdef HUGETLB_USE_PROC_MEMINFO
 PSI_file_key key_file_proc_meminfo;
 #endif /* HUGETLB_USE_PROC_MEMINFO */
@@ -552,11 +543,6 @@ void my_init_mysys_psi_keys()
   count= sizeof(all_mysys_conds)/sizeof(all_mysys_conds[0]);
   mysql_cond_register(category, all_mysys_conds, count);
 
-#ifdef USE_ALARM_THREAD
-  count= sizeof(all_mysys_threads)/sizeof(all_mysys_threads[0]);
-  mysql_thread_register(category, all_mysys_threads, count);
-#endif /* USE_ALARM_THREAD */
-
   count= sizeof(all_mysys_files)/sizeof(all_mysys_files[0]);
   mysql_file_register(category, all_mysys_files, count);
 

mysys/my_pthread.c

@@ -44,13 +44,6 @@ void *my_pthread_getspecific_imp(pthread_key_t key)
 }
 #endif
 
-/*
-  Some functions for RTS threads, AIX, Siemens Unix and UnixWare 7
-  (and DEC OSF/1 3.2 too)
-*/
-
-int my_pthread_create_detached=1;
-
 #if defined(HAVE_NONPOSIX_SIGWAIT) || defined(HAVE_DEC_3_2_THREADS)
 
 int my_sigwait(const sigset_t *set,int *sig)
@@ -117,7 +110,7 @@ struct tm *gmtime_r(const time_t *clock, struct tm *res)
 ** Author: Gary Wisniewski <garyw@spidereye.com.au>, much modified by Monty
 ****************************************************************************/
 
-#if !defined(HAVE_SIGWAIT) && !defined(sigwait) && !defined(__WIN__) && !defined(HAVE_rts_threads) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS)
+#if !defined(HAVE_SIGWAIT) && !defined(sigwait) && !defined(__WIN__) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS)
 
 #if !defined(DONT_USE_SIGSUSPEND)
 

mysys/mysys_priv.h

@@ -48,10 +48,6 @@ extern PSI_cond_key key_COND_alarm, key_IO_CACHE_SHARE_cond,
   key_IO_CACHE_SHARE_cond_writer, key_my_thread_var_suspend,
   key_THR_COND_threads;
 
-#ifdef USE_ALARM_THREAD
-extern PSI_thread_key key_thread_alarm;
-#endif /* USE_ALARM_THREAD */
-
 #endif /* HAVE_PSI_INTERFACE */
 
 extern PSI_stage_info stage_waiting_for_table_level_lock;

mysys/thr_alarm.c

@@ -17,8 +17,6 @@
 #define FORCE_DBUG_OFF
 #include "mysys_priv.h"
 #include <my_global.h>
-
-#if !defined(DONT_USE_THR_ALARM)
 #include <errno.h>
 #include <my_pthread.h>
 #include <signal.h>
@@ -53,12 +51,7 @@ pthread_t alarm_thread;
 
 #define MY_THR_ALARM_QUEUE_EXTENT 10
 
-#ifdef USE_ALARM_THREAD
-static void *alarm_handler(void *arg);
-#define reschedule_alarms() mysql_cond_signal(&COND_alarm)
-#else
 #define reschedule_alarms() pthread_kill(alarm_thread,THR_SERVER_ALARM)
-#endif
 
 static sig_handler thread_alarm(int sig __attribute__((unused)));
 
@@ -84,27 +77,14 @@ void init_thr_alarm(uint max_alarms)
     thr_client_alarm= SIGALRM;
   else
     thr_client_alarm= SIGUSR1;
-#ifndef USE_ALARM_THREAD
   if (thd_lib_detected != THD_LIB_LT)
-#endif
   {
     my_sigset(thr_client_alarm, thread_alarm);
   }
   sigemptyset(&s);
   sigaddset(&s, THR_SERVER_ALARM);
   alarm_thread=pthread_self();
-#if defined(USE_ALARM_THREAD)
-  {
-    pthread_attr_t thr_attr;
-    pthread_attr_init(&thr_attr);
-    pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
-    pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
-    pthread_attr_setstacksize(&thr_attr,8196);
-    mysql_thread_create(key_thread_alarm,
-                        &alarm_thread, &thr_attr, alarm_handler, NULL);
-    pthread_attr_destroy(&thr_attr);
-  }
-#elif defined(USE_ONE_SIGNAL_HAND)
+#if defined(USE_ONE_SIGNAL_HAND)
   pthread_sigmask(SIG_BLOCK, &s, NULL);		/* used with sigwait() */
   if (thd_lib_detected == THD_LIB_LT)
   {
@@ -313,18 +293,14 @@ sig_handler process_alarm(int sig __attribute__((unused)))
     process_alarm() at the same time
   */
 
-#ifndef USE_ALARM_THREAD
   pthread_sigmask(SIG_SETMASK,&full_signal_set,&old_mask);
   mysql_mutex_lock(&LOCK_alarm);
-#endif
   process_alarm_part2(sig);
-#ifndef USE_ALARM_THREAD
 #if defined(SIGNAL_HANDLER_RESET_ON_DELIVERY) && !defined(USE_ONE_SIGNAL_HAND)
   my_sigset(THR_SERVER_ALARM,process_alarm);
 #endif
   mysql_mutex_unlock(&LOCK_alarm);
   pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
-#endif
   return;
 }
 
@@ -358,10 +334,8 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
 	else
 	  i++;					/* Signal next thread */
       }
-#ifndef USE_ALARM_THREAD
       if (alarm_queue.elements)
 	alarm(1);				/* Signal soon again */
-#endif
     }
     else
     {
@@ -387,7 +361,6 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
 	  queue_replaced(&alarm_queue);
 	}
       }
-#ifndef USE_ALARM_THREAD
       if (alarm_queue.elements)
       {
 #ifdef __bsdi__
@@ -396,7 +369,6 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
 	alarm((uint) (alarm_data->expire_time-now));
         next_alarm_expire_time= alarm_data->expire_time;
       }
-#endif
     }
   }
   else
@@ -533,66 +505,6 @@ static sig_handler thread_alarm(int sig __attribute__((unused)))
 #define tv_nsec ts_nsec
 #endif
 
-/* set up a alarm thread with uses 'sleep' to sleep between alarms */
-
-#ifdef USE_ALARM_THREAD
-static void *alarm_handler(void *arg __attribute__((unused)))
-{
-  int error;
-  struct timespec abstime;
-#ifdef MAIN
-  puts("Starting alarm thread");
-#endif
-  my_thread_init();
-  alarm_thread_running= 1;
-  mysql_mutex_lock(&LOCK_alarm);
-  for (;;)
-  {
-    if (alarm_queue.elements)
-    {
-      ulong sleep_time,now= my_time(0);
-      if (alarm_aborted)
-	sleep_time=now+1;
-      else
-	sleep_time= ((ALARM*) queue_top(&alarm_queue))->expire_time;
-      if (sleep_time > now)
-      {
-	abstime.tv_sec=sleep_time;
-	abstime.tv_nsec=0;
-        next_alarm_expire_time= sleep_time;
-        if ((error= mysql_cond_timedwait(&COND_alarm, &LOCK_alarm, &abstime)) &&
-	    error != ETIME && error != ETIMEDOUT)
-	{
-#ifdef MAIN
-	  printf("Got error: %d from ptread_cond_timedwait (errno: %d)\n",
-		 error,errno);
-#endif
-	}
-      }
-    }
-    else if (alarm_aborted == -1)
-      break;
-    else
-    {
-      next_alarm_expire_time= ~ (time_t) 0;
-      if ((error= mysql_cond_wait(&COND_alarm, &LOCK_alarm)))
-      {
-#ifdef MAIN
-        printf("Got error: %d from ptread_cond_wait (errno: %d)\n",
-               error,errno);
-#endif
-      }
-    }
-    process_alarm(0);
-  }
-  memset(&alarm_thread, 0, sizeof(alarm_thread)); /* For easy debugging */
-  alarm_thread_running= 0;
-  mysql_cond_signal(&COND_alarm);
-  mysql_mutex_unlock(&LOCK_alarm);
-  pthread_exit(0);
-  return 0;					/* Impossible */
-}
-#endif /* USE_ALARM_THREAD */
 
 /*****************************************************************************
   thr_alarm for win95
@@ -680,14 +592,11 @@ void resize_thr_alarm(uint max_alarms)
 
 #endif /* __WIN__ */
 
-#endif
-
 /****************************************************************************
   Handling of test case (when compiled with -DMAIN)
 ***************************************************************************/
 
 #ifdef MAIN
-#if !defined(DONT_USE_THR_ALARM)
 
 static mysql_cond_t COND_thread_count;
 static mysql_mutex_t LOCK_thread_count;
@@ -954,13 +863,4 @@ int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
   return 0;
 }
 
-#else /* !defined(DONT_USE_ALARM_THREAD) */
-
-int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
-{
-  printf("thr_alarm disabled with DONT_USE_THR_ALARM\n");
-  exit(1);
-}
-
-#endif /* !defined(DONT_USE_ALARM_THREAD) */
 #endif /* MAIN */

sql/mysqld.cc

@@ -1315,10 +1315,8 @@ static void close_connections(void)
     LINT_INIT(error);
     DBUG_PRINT("info",("Waiting for select thread"));
 
-#ifndef DONT_USE_THR_ALARM
     if (pthread_kill(select_thread, thr_client_alarm))
       break;          // allready dead
-#endif
     set_timespec(abstime, 2);
     for (uint tmp=0 ; tmp < 10 && select_thread_in_use; tmp++)
     {

sql/rpl_slave.cc

@@ -948,15 +948,13 @@ terminate_slave_thread(THD *thd,
     DBUG_PRINT("loop", ("killing slave thread"));
 
     mysql_mutex_lock(&thd->LOCK_thd_data);
-#ifndef DONT_USE_THR_ALARM
     /*
       Error codes from pthread_kill are:
       EINVAL: invalid signal number (can't happen)
       ESRCH: thread already killed (can happen, should be ignored)
     */
     int err __attribute__((unused))= pthread_kill(thd->real_id, thr_client_alarm);
     DBUG_ASSERT(err != EINVAL);
-#endif
     thd->awake(THD::NOT_KILLED);
     mysql_mutex_unlock(&thd->LOCK_thd_data);
 

sql/sql_test.cc

@@ -499,7 +499,6 @@ Open streams:  %10lu\n",
 	 (ulong) my_stream_opened);
 
   ALARM_INFO alarm_info;
-#ifndef DONT_USE_THR_ALARM
   thr_alarm_info(&alarm_info);
   printf("\nAlarm status:\n\
 Active alarms:   %u\n\
@@ -508,7 +507,6 @@ Next alarm time: %lu\n",
 	 alarm_info.active_alarms,
 	 alarm_info.max_used_alarms,
 	 alarm_info.next_alarm_time);
-#endif
   display_table_locks();
 #ifdef HAVE_MALLINFO
   struct mallinfo info= mallinfo();