mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
84f81dc593
Call pthread_mutex_destroy() on not used mutex. Changed comments in .h and .c files from // -> /* */ Added detection of mutex on which one didn't call pthread_mutex_destroy() Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression" Added optimisation for ORDER BY NULL BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75: Delete: sql/ChangeLog BUILD/compile-pentium-valgrind-max: Don't use valgrind with safemalloc as this can hide some bugs Makefile.am: Added platform dirs bdb/os/os_handle.c: Portability fix client/mysql.cc: Fixes for Netware. Fixed duplicate output when using 'tee' Simple optimisations client/mysqldump.c: Portability fix client/mysqltest.c: Portability fix configure.in: Fixes for Netware extra/resolveip.c: Fixes for Netware include/Makefile.am: Fixes for Netware include/config-win.h: Portability fix include/my_global.h: Fixes for Netware include/my_net.h: Fixes for Netware include/my_pthread.h: Fixes for Netware Added detection of mutexes that was not destroyed include/my_sys.h: Fixes for Netware Added 'extern' before external functions include/mysql.h: Fixes for Netware innobase/configure.in: Fixes for Netware innobase/include/os0thread.h: Fixes for Netware innobase/os/os0sync.c: Fixes for Netware innobase/os/os0thread.c: Fixes for Netware innobase/srv/srv0srv.c: Fixes for Netware innobase/srv/srv0start.c: Fixes for Netware innobase/sync/sync0sync.c: Fixes for Netware isam/test3.c: Disable test on Netware libmysql/Makefile.shared: Added my_sleep libmysql/get_password.c: Fixes for Netware libmysql/libmysql.c: Fixes for Netware Made mysql_once_init() global libmysql/manager.c: Fixes for Netware myisam/mi_test3.c: Disable test for netware mysql-test/mysql-test-run.sh: Give warning if output file contains errors mysql-test/r/count_distinct.result: More tests mysql-test/r/group_by.result: Test of ORDER BY NULL mysql-test/t/backup.test: Fixes for Netware mysql-test/t/count_distinct.test: More tests mysql-test/t/func_crypt.test: Fixes for Netware mysql-test/t/grant_cache.test: Fixes for Netware mysql-test/t/group_by.test: Tests of ORDER BY NULL mysql-test/t/rpl000015.test: Fixes for Netware mysql-test/t/rpl000017.test: Fixes for Netware mysql-test/t/rpl_rotate_logs.test: Fixes for Netware mysys/Makefile.am: Added my_sleep.c and my_netware.c mysys/charset.c: Fixes for Netware mysys/default.c: Fixes for Netware mysys/mf_tempfile.c: Fixes for Netware mysys/my_clock.c: Fixes for Netware mysys/my_copy.c: Fixes for Netware mysys/my_getwd.c: Changed function comment from // -> /* */ mysys/my_init.c: Fixes for Netware mysys/my_lock.c: Fixes for Netware mysys/my_messnc.c: Fixes for Netware mysys/my_os2cond.c: Removed comment mysys/my_os2dirsrch.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2dirsrch.h: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2file64.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2mutex.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2thread.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_os2tls.c: Changed function comment from // -> /* */ Fixed indentation mysys/my_pthread.c: Fixes for Netware mysys/my_redel.c: Fixes for Netware mysys/my_tempnam.c: Fixes for Netware mysys/my_thr_init.c: Remove created mutexes when program ends. mysys/mysys_priv.h: Cleanup mysys/safemalloc.c: Prefix error messages with "Error:" mysys/thr_alarm.c: Destroy internal mutex on end_thr_alarm. mysys/thr_mutex.c: Added detection of mutex on which one didn't call pthread_mutex_destroy() scripts/make_binary_distribution.sh: Fixes for Netware sql/des_key_file.cc: Free mutex at end sql/ha_innodb.cc: Free mutex at end sql/ha_myisam.cc: Changed warnings from REPAIR Note: (For mysql-test-run) sql/hostname.cc: Fixes for Netware sql/item.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/item_func.cc: Free used mutexes sql/item_sum.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/log.cc: Free used mutexes sql/my_lock.c: Fixes for Netware sql/mysql_priv.h: Fixes for Netware sql/mysqld.cc: Fixes for Netware Added Have_crypt Properly free mutexes from MYSQL_LOG by calling cleanup Free mutex before exit sql/repl_failsafe.cc: Fixes for Netware sql/set_var.cc: Added have_crypt sql/share/english/errmsg.txt: Added version socket and port to stderr log sql/slave.cc: Remove global MASTER_INFO variable and use instead an allocated variable. This allows us to correctly free used mutex. sql/slave.h: Move constructors and destuctors to slave.cc (To make it easier to clear all needed variables) sql/sql_base.cc: Safety fix sql/sql_class.h: Portability fixes. Added 'cleanup' to log handling to be able to free mutexes. sql/sql_insert.cc: Fixes for Netware mysys/my_sleep.c: E sql/sql_parse.cc: Fixes for Netware sql/sql_select.cc: Added optimisation for ORDER BY NULL sql/sql_select.h: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_table.cc: Fixed bug in create_tmp_field() which causes a memory overrun sql/sql_udf.cc: Free mutex on end vio/test-ssl.c: Simple code cleanup vio/test-sslclient.c: Simple code cleanup vio/test-sslserver.c: Simple code cleanup vio/viotest-ssl.c: Simple code cleanup
257 lines
7 KiB
C
257 lines
7 KiB
C
/* Copyright (C) 2000 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; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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 */
|
|
|
|
/*
|
|
Functions to handle initializating and allocationg of all mysys & debug
|
|
thread variables.
|
|
*/
|
|
|
|
#include "mysys_priv.h"
|
|
#include <m_string.h>
|
|
|
|
#ifdef THREAD
|
|
#ifdef USE_TLS
|
|
pthread_key(struct st_my_thread_var*, THR_KEY_mysys);
|
|
#else
|
|
pthread_key(struct st_my_thread_var, THR_KEY_mysys);
|
|
#endif /* USE_TLS */
|
|
pthread_mutex_t THR_LOCK_malloc,THR_LOCK_open,THR_LOCK_keycache,
|
|
THR_LOCK_lock,THR_LOCK_isam,THR_LOCK_myisam,THR_LOCK_heap,
|
|
THR_LOCK_net, THR_LOCK_charset;
|
|
#ifndef HAVE_LOCALTIME_R
|
|
pthread_mutex_t LOCK_localtime_r;
|
|
#endif
|
|
#ifndef HAVE_GETHOSTBYNAME_R
|
|
pthread_mutex_t LOCK_gethostbyname_r;
|
|
#endif
|
|
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
|
|
pthread_mutexattr_t my_fast_mutexattr;
|
|
#endif
|
|
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
|
|
pthread_mutexattr_t my_errchk_mutexattr;
|
|
#endif
|
|
|
|
my_bool my_thread_global_init(void)
|
|
{
|
|
if (pthread_key_create(&THR_KEY_mysys,free))
|
|
{
|
|
fprintf(stderr,"Can't initialize threads: error %d\n",errno);
|
|
exit(1);
|
|
}
|
|
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
|
|
pthread_mutexattr_init(&my_fast_mutexattr);
|
|
pthread_mutexattr_setkind_np(&my_fast_mutexattr,PTHREAD_MUTEX_ADAPTIVE_NP);
|
|
#endif
|
|
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
|
|
pthread_mutexattr_init(&my_errchk_mutexattr);
|
|
pthread_mutexattr_setkind_np(&my_errchk_mutexattr,
|
|
PTHREAD_MUTEX_ERRORCHECK_NP);
|
|
#endif
|
|
|
|
pthread_mutex_init(&THR_LOCK_malloc,MY_MUTEX_INIT_FAST);
|
|
pthread_mutex_init(&THR_LOCK_open,MY_MUTEX_INIT_FAST);
|
|
pthread_mutex_init(&THR_LOCK_keycache,MY_MUTEX_INIT_FAST);
|
|
pthread_mutex_init(&THR_LOCK_lock,MY_MUTEX_INIT_FAST);
|
|
pthread_mutex_init(&THR_LOCK_isam,MY_MUTEX_INIT_SLOW);
|
|
pthread_mutex_init(&THR_LOCK_myisam,MY_MUTEX_INIT_SLOW);
|
|
pthread_mutex_init(&THR_LOCK_heap,MY_MUTEX_INIT_FAST);
|
|
pthread_mutex_init(&THR_LOCK_net,MY_MUTEX_INIT_FAST);
|
|
pthread_mutex_init(&THR_LOCK_charset,MY_MUTEX_INIT_FAST);
|
|
#if defined( __WIN__) || defined(OS2)
|
|
win_pthread_init();
|
|
#endif
|
|
#ifndef HAVE_LOCALTIME_R
|
|
pthread_mutex_init(&LOCK_localtime_r,MY_MUTEX_INIT_SLOW);
|
|
#endif
|
|
#ifndef HAVE_GETHOSTBYNAME_R
|
|
pthread_mutex_init(&LOCK_gethostbyname_r,MY_MUTEX_INIT_SLOW);
|
|
#endif
|
|
return my_thread_init();
|
|
}
|
|
|
|
|
|
void my_thread_global_end(void)
|
|
{
|
|
#if defined(USE_TLS)
|
|
(void) TlsFree(THR_KEY_mysys);
|
|
#endif
|
|
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
|
|
pthread_mutexattr_destroy(&my_fast_mutexattr);
|
|
#endif
|
|
#ifdef PPTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
|
|
pthread_mutexattr_destroy(&my_errchk_mutexattr);
|
|
#endif
|
|
pthread_mutex_destroy(&THR_LOCK_malloc);
|
|
pthread_mutex_destroy(&THR_LOCK_open);
|
|
pthread_mutex_destroy(&THR_LOCK_keycache);
|
|
pthread_mutex_destroy(&THR_LOCK_lock);
|
|
pthread_mutex_destroy(&THR_LOCK_isam);
|
|
pthread_mutex_destroy(&THR_LOCK_myisam);
|
|
pthread_mutex_destroy(&THR_LOCK_heap);
|
|
pthread_mutex_destroy(&THR_LOCK_net);
|
|
pthread_mutex_destroy(&THR_LOCK_charset);
|
|
#ifndef HAVE_LOCALTIME_R
|
|
pthread_mutex_destroy(&LOCK_localtime_r);
|
|
#endif
|
|
#ifndef HAVE_GETHOSTBYNAME_R
|
|
pthread_mutex_destroy(&LOCK_gethostbyname_r);
|
|
#endif
|
|
}
|
|
|
|
static long thread_id=0;
|
|
|
|
/*
|
|
We can't use mutex_locks here if we are using windows as
|
|
we may have compiled the program with SAFE_MUTEX, in which
|
|
case the checking of mutex_locks will not work until
|
|
the pthread_self thread specific variable is initialized.
|
|
*/
|
|
|
|
my_bool my_thread_init(void)
|
|
{
|
|
struct st_my_thread_var *tmp;
|
|
my_bool error=0;
|
|
|
|
#ifdef EXTRA_DEBUG_THREADS
|
|
fprintf(stderr,"my_thread_init(): thread_id=%ld\n",pthread_self());
|
|
#endif
|
|
#if !defined(__WIN__) || defined(USE_TLS) || ! defined(SAFE_MUTEX)
|
|
pthread_mutex_lock(&THR_LOCK_lock);
|
|
#endif
|
|
|
|
#if !defined(__WIN__) || defined(USE_TLS)
|
|
if (my_pthread_getspecific(struct st_my_thread_var *,THR_KEY_mysys))
|
|
{
|
|
#ifdef EXTRA_DEBUG_THREADS
|
|
fprintf(stderr,"my_thread_init() called more than once in thread %ld\n",
|
|
pthread_self());
|
|
#endif
|
|
goto end;
|
|
}
|
|
if (!(tmp= (struct st_my_thread_var *) calloc(1, sizeof(*tmp))))
|
|
{
|
|
error= 1;
|
|
goto end;
|
|
}
|
|
pthread_setspecific(THR_KEY_mysys,tmp);
|
|
|
|
#else
|
|
/*
|
|
Skip initialization if the thread specific variable is already initialized
|
|
*/
|
|
if (THR_KEY_mysys.id)
|
|
goto end;
|
|
tmp= &THR_KEY_mysys;
|
|
#endif
|
|
tmp->id= ++thread_id;
|
|
pthread_mutex_init(&tmp->mutex,MY_MUTEX_INIT_FAST);
|
|
pthread_cond_init(&tmp->suspend, NULL);
|
|
|
|
end:
|
|
#if !defined(__WIN__) || defined(USE_TLS) || ! defined(SAFE_MUTEX)
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
#endif
|
|
return error;
|
|
}
|
|
|
|
|
|
void my_thread_end(void)
|
|
{
|
|
struct st_my_thread_var *tmp=my_thread_var;
|
|
#ifdef EXTRA_DEBUG_THREADS
|
|
fprintf(stderr,"my_thread_end(): tmp=%p,thread_id=%ld\n",
|
|
tmp,pthread_self());
|
|
#endif
|
|
if (tmp)
|
|
{
|
|
#if !defined(DBUG_OFF)
|
|
/* tmp->dbug is allocated inside DBUG library */
|
|
if (tmp->dbug)
|
|
{
|
|
free(tmp->dbug);
|
|
tmp->dbug=0;
|
|
}
|
|
#endif
|
|
#if !defined(__bsdi__) || defined(HAVE_mit_thread) /* bsdi dumps core here */
|
|
pthread_cond_destroy(&tmp->suspend);
|
|
#endif
|
|
pthread_mutex_destroy(&tmp->mutex);
|
|
#if (!defined(__WIN__) && !defined(OS2)) || defined(USE_TLS)
|
|
free(tmp);
|
|
#endif
|
|
}
|
|
/* The following free has to be done, even if my_thread_var() is 0 */
|
|
#if (!defined(__WIN__) && !defined(OS2)) || defined(USE_TLS)
|
|
pthread_setspecific(THR_KEY_mysys,0);
|
|
#endif
|
|
}
|
|
|
|
struct st_my_thread_var *_my_thread_var(void)
|
|
{
|
|
struct st_my_thread_var *tmp=
|
|
my_pthread_getspecific(struct st_my_thread_var*,THR_KEY_mysys);
|
|
#if defined(USE_TLS)
|
|
/* This can only happen in a .DLL */
|
|
if (!tmp)
|
|
{
|
|
my_thread_init();
|
|
tmp=my_pthread_getspecific(struct st_my_thread_var*,THR_KEY_mysys);
|
|
}
|
|
#endif
|
|
return tmp;
|
|
}
|
|
|
|
|
|
/****************************************************************************
|
|
Get name of current thread.
|
|
****************************************************************************/
|
|
|
|
#define UNKNOWN_THREAD -1
|
|
|
|
long my_thread_id()
|
|
{
|
|
#if defined(HAVE_PTHREAD_GETSEQUENCE_NP)
|
|
return pthread_getsequence_np(pthread_self());
|
|
#elif (defined(__sun) || defined(__sgi) || defined(__linux__)) && !defined(HAVE_mit_thread)
|
|
return pthread_self();
|
|
#else
|
|
return my_thread_var->id;
|
|
#endif
|
|
}
|
|
|
|
#ifdef DBUG_OFF
|
|
const char *my_thread_name(void)
|
|
{
|
|
return "no_name";
|
|
}
|
|
|
|
#else
|
|
|
|
const char *my_thread_name(void)
|
|
{
|
|
char name_buff[100];
|
|
struct st_my_thread_var *tmp=my_thread_var;
|
|
if (!tmp->name[0])
|
|
{
|
|
long id=my_thread_id();
|
|
sprintf(name_buff,"T@%ld", id);
|
|
strmake(tmp->name,name_buff,THREAD_NAME_SIZE);
|
|
}
|
|
return tmp->name;
|
|
}
|
|
#endif /* DBUG_OFF */
|
|
|
|
#endif /* THREAD */
|