mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
8f500c522b
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 client/mysql.cc: sql_protocol_typelib is not exported from libmysqld (does not make sense either) thus excluded from embedded client dbug/dbug.c: revert changes for Bug#38293 include/my_dbug.h: revert changes for Bug#38293 libmysql/libmysql.c: Removed DBUG_POP call, because when called after my_end(), will access THR_key_mysys that is already deleted. The result of pthread_get_specific is not predictable in this case and hence DBUG_POP can crash. libmysqld/examples/CMakeLists.txt: Revert changes for Bug#38293. libmysqld/lib_sql.cc: code to start handle manager is factored out into start_handle_manager() function libmysqld/libmysqld.def: Revert changes for Bug #38293 Remove excessive exports from libmysqld, export what API documents. mysys/my_thr_init.c: Remove windows-DLL-specific workaround for something (old code, no documentation for what specifically). The problem is that even after my_thread_end() is finished, DBUG statement can initiate my_thread_init(). This does not happen anywhere else and should not happen on Windows either. sql/mysql_priv.h: - new functions start_handle_manager() and stop_handle_manager() - move manager_thread_in_use variable to sql_manager.cc and made it static - remove manager_status, as it is unused sql/mysqld.cc: Code to start/stop handle_manager thread is factored out into start_handle_manager()
159 lines
3.9 KiB
C++
159 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;
|
|
}
|
|
|