mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	The problem here is that embedded server starts handle_thread manager 
thread  on mysql_library_init() does not stop it on mysql_library_end().
At shutdown, my_thread_global_end() waits for thread count to become 0,
but since we did not stop the thread it will give up after 5 seconds.
             
Solution is to move shutdown for handle_manager thread from kill_server()
(mysqld specific) to clean_up() that is used by both embedded and mysqld.
            
This patch also contains some refactorings - to avoid duplicate code,
start_handle_manager() and stop_handle_manager() functions are introduced.
Unused variables are eliminated. handle_manager does not rely on global
variable abort_loop anymore to stop (abort_loop is not set for embedded).
            
Note: Specifically on Windows and when using DBUG version of libmysqld, 
the complete solution requires removing obsolete code my_thread_init() 
from my_thread_var(). This has a side effect that a DBUG statement 
after my_thread_end() can cause thread counter to be incremented, and 
embedded will hang for some seconds. Or worse, my_thread_init() will 
crash if critical sections have been deleted by the global cleanup 
routine that runs in a different thread. 
This patch also fixes and revert prior changes for Bug#38293 
"Libmysqld crash in mysql_library_init if language file missing".
Root cause of the crash observed in Bug#38293  was bug in my_thread_init() 
described above
		
	
		
			
				
	
	
		
			160 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			160 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
/* Copyright (C) 2000, 2002, 2005 MySQL AB
 | 
						|
 | 
						|
   This program is free software; you can redistribute it and/or modify
 | 
						|
   it under the terms of the GNU General Public License as published by
 | 
						|
   the Free Software Foundation; version 2 of the License.
 | 
						|
 | 
						|
   This program is distributed in the hope that it will be useful,
 | 
						|
   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
   GNU General Public License for more details.
 | 
						|
 | 
						|
   You should have received a copy of the GNU General Public License
 | 
						|
   along with this program; if not, write to the Free Software
 | 
						|
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 | 
						|
 | 
						|
/* 
 | 
						|
 * sql_manager.cc
 | 
						|
 * This thread manages various maintenance tasks.
 | 
						|
 *
 | 
						|
 *   o Flushing the tables every flush_time seconds.
 | 
						|
 *   o Berkeley DB: removing unneeded log files.
 | 
						|
 */
 | 
						|
 | 
						|
#include "mysql_priv.h"
 | 
						|
 | 
						|
 | 
						|
static bool volatile manager_thread_in_use;
 | 
						|
static bool abort_manager;
 | 
						|
 | 
						|
pthread_t manager_thread;
 | 
						|
pthread_mutex_t LOCK_manager;
 | 
						|
pthread_cond_t COND_manager;
 | 
						|
 | 
						|
struct handler_cb {
 | 
						|
   struct handler_cb *next;
 | 
						|
   void (*action)(void);
 | 
						|
};
 | 
						|
 | 
						|
static struct handler_cb * volatile cb_list;
 | 
						|
 | 
						|
bool mysql_manager_submit(void (*action)())
 | 
						|
{
 | 
						|
  bool result= FALSE;
 | 
						|
  struct handler_cb * volatile *cb;
 | 
						|
  pthread_mutex_lock(&LOCK_manager);
 | 
						|
  cb= &cb_list;
 | 
						|
  while (*cb && (*cb)->action != action)
 | 
						|
    cb= &(*cb)->next;
 | 
						|
  if (!*cb)
 | 
						|
  {
 | 
						|
    *cb= (struct handler_cb *)my_malloc(sizeof(struct handler_cb), MYF(MY_WME));
 | 
						|
    if (!*cb)
 | 
						|
      result= TRUE;
 | 
						|
    else
 | 
						|
    {
 | 
						|
      (*cb)->next= NULL;
 | 
						|
      (*cb)->action= action;
 | 
						|
    }
 | 
						|
  }
 | 
						|
  pthread_mutex_unlock(&LOCK_manager);
 | 
						|
  return result;
 | 
						|
}
 | 
						|
 | 
						|
pthread_handler_t handle_manager(void *arg __attribute__((unused)))
 | 
						|
{
 | 
						|
  int error = 0;
 | 
						|
  struct timespec abstime;
 | 
						|
  bool reset_flush_time = TRUE;
 | 
						|
  struct handler_cb *cb= NULL;
 | 
						|
  my_thread_init();
 | 
						|
  DBUG_ENTER("handle_manager");
 | 
						|
 | 
						|
  pthread_detach_this_thread();
 | 
						|
  manager_thread = pthread_self();
 | 
						|
  manager_thread_in_use = 1;
 | 
						|
 | 
						|
  for (;;)
 | 
						|
  {
 | 
						|
    pthread_mutex_lock(&LOCK_manager);
 | 
						|
    /* XXX: This will need to be made more general to handle different
 | 
						|
     * polling needs. */
 | 
						|
    if (flush_time)
 | 
						|
    {
 | 
						|
      if (reset_flush_time)
 | 
						|
      {
 | 
						|
	set_timespec(abstime, flush_time);
 | 
						|
        reset_flush_time = FALSE;
 | 
						|
      }
 | 
						|
      while ((!error || error == EINTR) && !abort_manager)
 | 
						|
        error= pthread_cond_timedwait(&COND_manager, &LOCK_manager, &abstime);
 | 
						|
    }
 | 
						|
    else
 | 
						|
    {
 | 
						|
      while ((!error || error == EINTR) && !abort_manager)
 | 
						|
        error= pthread_cond_wait(&COND_manager, &LOCK_manager);
 | 
						|
    }
 | 
						|
    if (cb == NULL)
 | 
						|
    {
 | 
						|
      cb= cb_list;
 | 
						|
      cb_list= NULL;
 | 
						|
    }
 | 
						|
    pthread_mutex_unlock(&LOCK_manager);
 | 
						|
 | 
						|
    if (abort_manager)
 | 
						|
      break;
 | 
						|
 | 
						|
    if (error == ETIMEDOUT || error == ETIME)
 | 
						|
    {
 | 
						|
      flush_tables();
 | 
						|
      error = 0;
 | 
						|
      reset_flush_time = TRUE;
 | 
						|
    }
 | 
						|
 | 
						|
    while (cb)
 | 
						|
    {
 | 
						|
      struct handler_cb *next= cb->next;
 | 
						|
      cb->action();
 | 
						|
      my_free((uchar*)cb, MYF(0));
 | 
						|
      cb= next;
 | 
						|
    }
 | 
						|
  }
 | 
						|
  manager_thread_in_use = 0;
 | 
						|
  DBUG_LEAVE; // Can't use DBUG_RETURN after my_thread_end
 | 
						|
  my_thread_end();
 | 
						|
  return (NULL);
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* Start handle manager thread */
 | 
						|
void start_handle_manager()
 | 
						|
{
 | 
						|
  DBUG_ENTER("start_handle_manager");
 | 
						|
  abort_manager = false;
 | 
						|
  if (flush_time && flush_time != ~(ulong) 0L)
 | 
						|
  {
 | 
						|
    pthread_t hThread;
 | 
						|
    if (pthread_create(&hThread,&connection_attrib,handle_manager,0))
 | 
						|
      sql_print_warning("Can't create handle_manager thread");
 | 
						|
  }
 | 
						|
  DBUG_VOID_RETURN;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* Initiate shutdown of handle manager thread */
 | 
						|
void stop_handle_manager()
 | 
						|
{
 | 
						|
  DBUG_ENTER("stop_handle_manager");
 | 
						|
  abort_manager = true;
 | 
						|
  pthread_mutex_lock(&LOCK_manager);
 | 
						|
  if (manager_thread_in_use)
 | 
						|
  {
 | 
						|
    DBUG_PRINT("quit", ("initiate shutdown of handle manager thread: 0x%lx",
 | 
						|
                        (ulong)manager_thread));
 | 
						|
   pthread_cond_signal(&COND_manager);
 | 
						|
  }
 | 
						|
  pthread_mutex_unlock(&LOCK_manager);
 | 
						|
  DBUG_VOID_RETURN;
 | 
						|
}
 | 
						|
 |