mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
35da5e43fb
Fixed compiler warnings (IRIX C compiler and VC++) VC++Files/client/mysqlclient.dsp: Add missing file to project VC++Files/libmysql/libmysql.dsp: Add missing file to project VC++Files/myisam/myisam.dsp: Add missing file to project VC++Files/mysys/mysys.dsp: Add missing file to project heap/hp_test1.c: Fixed wrong call to heap_rkey() heap/hp_test2.c: Fixed wrong call to heap_rkey() include/hash.h: Move not used (internal) struct to hash.c include/my_pthread.h: Made some structs 'const char*' to avoid warnings include/my_sys.h: Moved key cache structs and functions to keycache.h include/myisam.h: Merge key cache structures to one include/mysql.h: Remove STDCALL from internal functions include/sql_common.h: Remove STDCALL from internal functions include/violite.h: Fixed compiler warning isam/_locking.c: Merge key cache structures to one isam/_page.c: Merge key cache structures to one isam/close.c: Merge key cache structures to one isam/extra.c: Merge key cache structures to one isam/isamchk.c: Merge key cache structures to one isam/isamdef.h: Merge key cache structures to one isam/isamlog.c: Merge key cache structures to one isam/panic.c: Merge key cache structures to one isam/test2.c: Merge key cache structures to one isam/test3.c: Merge key cache structures to one libmysql/client_settings.h: Remove STDCALL from internal functions libmysql/libmysql.c: Remove STDCALL from internal functions myisam/ft_boolean_search.c: Fixed compiler warning myisam/ft_dump.c: Fixed compiler warnings (%qx is not portable) myisam/ft_update.c: Fixed compiler warnings myisam/mi_check.c: Merge key cache structures to one myisam/mi_close.c: Merge key cache structures to one myisam/mi_delete_all.c: Merge key cache structures to one myisam/mi_extra.c: Merge key cache structures to one myisam/mi_keycache.c: Merge key cache structures to one myisam/mi_locking.c: Merge key cache structures to one myisam/mi_page.c: Merge key cache structures to one myisam/mi_panic.c: Merge key cache structures to one myisam/mi_preload.c: Merge key cache structures to one myisam/mi_test1.c: Merge key cache structures to one myisam/mi_test2.c: Merge key cache structures to one myisam/mi_test3.c: Merge key cache structures to one myisam/myisamchk.c: Merge key cache structures to one myisam/myisamdef.h: Merge key cache structures to one myisam/myisamlog.c: Merge key cache structures to one Removed not used option myisam/sort.c: Fixed compiler warnings myisam/sp_test.c: Fixed compiler warnings mysql-test/r/case.result: Updated results after fix of correct NULL detection in WHEN mysql-test/r/date_formats.result: Updated results after fixing date handling mysql-test/r/symlink.result: Updated results after adding DEFAULT CHARSET mysql-test/t/case.test: New test mysql-test/t/symlink.test: Updated error numbers mysys/hash.c: Made HASH_LINK struct local mysys/mf_keycache.c: Merge key cache structures to one Fixed key_cache_read() and key_cache_write() to be resize-safe. mysys/mf_keycaches.c: Merge key cache structures to one mysys/thr_mutex.c: Added test if mutex is initalized sql-common/client.c: Remove STDCALL from internal functions sql/derror.cc: Added comment sql/field.cc: Removed not used variables sql/ha_innodb.cc: Fixed compiler warnings (removed not used variables) sql/ha_myisam.cc: Merge key cache structures to one sql/ha_myisammrg.cc: Removed not used variables sql/handler.cc: Merge key cache structures to one sql/handler.h: Merge key cache structures to one sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Remove not used variables sql/item_func.cc: Remove not used variables sql/item_strfunc.cc: Removed not used variables sql/item_sum.cc: Removed not used variables Moved setting of item_thd to fix_fields() sql/item_timefunc.cc: Removed not used variables sql/mysql_priv.h: Merge key cache structures to one sql/mysqld.cc: Merge key cache structures to one init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used sql/opt_sum.cc: Remove not used variables sql/protocol.cc: Don't send errors after ok has been sent sql/protocol_cursor.cc: Remove not used variable Simple optimization sql/repl_failsafe.cc: Remove not used variables sql/set_var.cc: Merge key cache structures to one sql/set_var.h: Merge key cache structures to one sql/sql_acl.cc: Remove not used variables sql/sql_base.cc: Remove not used function sql/sql_db.cc: Remove not used variables sql/sql_handler.cc: Remove not used variables sql/sql_insert.cc: More DBUG statements Simple code cleanup sql/sql_lex.cc: Remove not used variables sql/sql_parse.cc: Remove not used variables sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: Remove not used variables sql/sql_select.cc: Remove not used variables sql/sql_show.cc: Remove not used variables sql/sql_table.cc: Merge key cache structures to one Removed not used variables sql/sql_test.cc: Merge key cache structures to one sql/strfunc.cc: Fixed that find_type() returns correct value for partly matched words. (This fixed the error found by date_formats.test) sql/time.cc: Remove not used variables strings/my_strtoll10.c: Fixed compiler warnings
348 lines
9.5 KiB
C
348 lines
9.5 KiB
C
/* Copyright (C) 2000-2003 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 */
|
|
|
|
/* This makes a wrapper for mutex handling to make it easier to debug mutex */
|
|
|
|
#include <my_global.h>
|
|
#if defined(HAVE_LINUXTHREADS) && !defined (__USE_UNIX98)
|
|
#define __USE_UNIX98 /* To get rw locks under Linux */
|
|
#endif
|
|
#if defined(THREAD) && defined(SAFE_MUTEX)
|
|
#undef SAFE_MUTEX /* Avoid safe_mutex redefinitions */
|
|
#include "mysys_priv.h"
|
|
#include "my_static.h"
|
|
#include <m_string.h>
|
|
|
|
#ifndef DO_NOT_REMOVE_THREAD_WRAPPERS
|
|
/* Remove wrappers */
|
|
#undef pthread_mutex_t
|
|
#undef pthread_mutex_init
|
|
#undef pthread_mutex_lock
|
|
#undef pthread_mutex_unlock
|
|
#undef pthread_mutex_destroy
|
|
#undef pthread_cond_wait
|
|
#undef pthread_cond_timedwait
|
|
#ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
|
|
#define pthread_mutex_init(a,b) my_pthread_mutex_init((a),(b))
|
|
#endif
|
|
#endif /* DO_NOT_REMOVE_THREAD_WRAPPERS */
|
|
|
|
static pthread_mutex_t THR_LOCK_mutex;
|
|
static ulong safe_mutex_count= 0; /* Number of mutexes created */
|
|
#ifdef SAFE_MUTEX_DETECT_DESTROY
|
|
static struct st_safe_mutex_info_t *safe_mutex_root= NULL;
|
|
#endif
|
|
|
|
void safe_mutex_global_init(void)
|
|
{
|
|
pthread_mutex_init(&THR_LOCK_mutex,MY_MUTEX_INIT_FAST);
|
|
}
|
|
|
|
|
|
int safe_mutex_init(safe_mutex_t *mp,
|
|
const pthread_mutexattr_t *attr __attribute__((unused)),
|
|
const char *file,
|
|
uint line)
|
|
{
|
|
bzero((char*) mp,sizeof(*mp));
|
|
pthread_mutex_init(&mp->global,MY_MUTEX_INIT_ERRCHK);
|
|
pthread_mutex_init(&mp->mutex,attr);
|
|
/* Mark that mutex is initialized */
|
|
mp->file= file;
|
|
mp->line= line;
|
|
|
|
#ifdef SAFE_MUTEX_DETECT_DESTROY
|
|
/*
|
|
Monitor the freeing of mutexes. This code depends on single thread init
|
|
and destroy
|
|
*/
|
|
if ((mp->info= (safe_mutex_info_t *) malloc(sizeof(safe_mutex_info_t))))
|
|
{
|
|
struct st_safe_mutex_info_t *info =mp->info;
|
|
|
|
info->init_file= file;
|
|
info->init_line= line;
|
|
info->prev= NULL;
|
|
info->next= NULL;
|
|
|
|
pthread_mutex_lock(&THR_LOCK_mutex);
|
|
if ((info->next= safe_mutex_root))
|
|
safe_mutex_root->prev= info;
|
|
safe_mutex_root= info;
|
|
safe_mutex_count++;
|
|
pthread_mutex_unlock(&THR_LOCK_mutex);
|
|
}
|
|
#else
|
|
thread_safe_increment(safe_mutex_count, &THR_LOCK_mutex);
|
|
#endif /* SAFE_MUTEX_DETECT_DESTROY */
|
|
return 0;
|
|
}
|
|
|
|
|
|
int safe_mutex_lock(safe_mutex_t *mp,const char *file, uint line)
|
|
{
|
|
int error;
|
|
if (!mp->file)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to lock unitialized mutex at %s, line %d", file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count > 0 && pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to lock mutex at %s, line %d, when the mutex was already locked at %s, line %d in thread %s\n",
|
|
file,line,mp->file, mp->line, my_thread_name());
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
pthread_mutex_unlock(&mp->global);
|
|
error=pthread_mutex_lock(&mp->mutex);
|
|
if (error || (error=pthread_mutex_lock(&mp->global)))
|
|
{
|
|
fprintf(stderr,"Got error %d when trying to lock mutex at %s, line %d\n",
|
|
error, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Error in thread libray: Got mutex at %s, \
|
|
line %d more than 1 time\n", file,line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->thread=pthread_self();
|
|
mp->file= file;
|
|
mp->line=line;
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_mutex_unlock(safe_mutex_t *mp,const char *file, uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count == 0)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to unlock mutex that wasn't locked at %s, line %d\n Last used at %s, line: %d\n",
|
|
file,line,mp->file ? mp->file : "",mp->line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (!pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to unlock mutex at %s, line %d that was locked by another thread at: %s, line: %d\n",
|
|
file,line,mp->file,mp->line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->count--;
|
|
#ifdef __WIN__
|
|
pthread_mutex_unlock(&mp->mutex);
|
|
error=0;
|
|
#else
|
|
error=pthread_mutex_unlock(&mp->mutex);
|
|
if (error)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Got error: %d (%d) when trying to unlock mutex at %s, line %d\n", error, errno, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
#endif /* __WIN__ */
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp, const char *file,
|
|
uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count == 0)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to cond_wait on a unlocked mutex at %s, line %d\n",file,line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (!pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to cond_wait on a mutex at %s, line %d that was locked by another thread at: %s, line: %d\n",
|
|
file,line,mp->file,mp->line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
|
|
if (mp->count-- != 1)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Count was %d on locked mutex at %s, line %d\n",
|
|
mp->count+1, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
pthread_mutex_unlock(&mp->global);
|
|
error=pthread_cond_wait(cond,&mp->mutex);
|
|
pthread_mutex_lock(&mp->global);
|
|
if (error)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Got error: %d (%d) when doing a safe_mutex_wait at %s, line %d\n", error, errno, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Count was %d in thread %lx when locking mutex at %s, line %d\n",
|
|
mp->count-1, my_thread_id(), file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->thread=pthread_self();
|
|
mp->file= file;
|
|
mp->line=line;
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
|
|
struct timespec *abstime,
|
|
const char *file, uint line)
|
|
{
|
|
int error;
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count != 1 || !pthread_equal(pthread_self(),mp->thread))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to cond_wait at %s, line %d on a not hold mutex\n",file,line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->count--; /* Mutex will be released */
|
|
pthread_mutex_unlock(&mp->global);
|
|
error=pthread_cond_timedwait(cond,&mp->mutex,abstime);
|
|
#ifdef EXTRA_DEBUG
|
|
if (error && (error != EINTR && error != ETIMEDOUT))
|
|
{
|
|
fprintf(stderr,"safe_mutex: Got error: %d (%d) when doing a safe_mutex_timedwait at %s, line %d\n", error, errno, file, line);
|
|
}
|
|
#endif
|
|
pthread_mutex_lock(&mp->global);
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Count was %d in thread %lx when locking mutex at %s, line %d (error: %d (%d))\n",
|
|
mp->count-1, my_thread_id(), file, line, error, error);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
mp->thread=pthread_self();
|
|
mp->file= file;
|
|
mp->line=line;
|
|
pthread_mutex_unlock(&mp->global);
|
|
return error;
|
|
}
|
|
|
|
|
|
int safe_mutex_destroy(safe_mutex_t *mp, const char *file, uint line)
|
|
{
|
|
int error=0;
|
|
if (mp->count != 0)
|
|
{
|
|
fprintf(stderr,"safe_mutex: Trying to destroy a mutex that was locked at %s, line %d at %s, line %d\n",
|
|
mp->file,mp->line, file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
#ifdef __WIN__
|
|
pthread_mutex_destroy(&mp->global);
|
|
pthread_mutex_destroy(&mp->mutex);
|
|
#else
|
|
if (pthread_mutex_destroy(&mp->global))
|
|
error=1;
|
|
if (pthread_mutex_destroy(&mp->mutex))
|
|
error=1;
|
|
#endif
|
|
mp->file= 0; /* Mark destroyed */
|
|
|
|
#ifdef SAFE_MUTEX_DETECT_DESTROY
|
|
if (mp->info)
|
|
{
|
|
struct st_safe_mutex_info_t *info= mp->info;
|
|
pthread_mutex_lock(&THR_LOCK_mutex);
|
|
|
|
if (info->prev)
|
|
info->prev->next = info->next;
|
|
else
|
|
safe_mutex_root = info->next;
|
|
if (info->next)
|
|
info->next->prev = info->prev;
|
|
safe_mutex_count--;
|
|
|
|
pthread_mutex_unlock(&THR_LOCK_mutex);
|
|
free(info);
|
|
mp->info= NULL; /* Get crash if double free */
|
|
}
|
|
#else
|
|
thread_safe_sub(safe_mutex_count, 1, &THR_LOCK_mutex);
|
|
#endif /* SAFE_MUTEX_DETECT_DESTROY */
|
|
return error;
|
|
}
|
|
|
|
|
|
/*
|
|
Free global resources and check that all mutex has been destroyed
|
|
|
|
SYNOPSIS
|
|
safe_mutex_end()
|
|
file Print errors on this file
|
|
|
|
NOTES
|
|
We can't use DBUG_PRINT() here as we have in my_end() disabled
|
|
DBUG handling before calling this function.
|
|
|
|
In MySQL one may get one warning for a mutex created in my_thr_init.c
|
|
This is ok, as this thread may not yet have been exited.
|
|
*/
|
|
|
|
void safe_mutex_end(FILE *file __attribute__((unused)))
|
|
{
|
|
if (!safe_mutex_count) /* safetly */
|
|
pthread_mutex_destroy(&THR_LOCK_mutex);
|
|
#ifdef SAFE_MUTEX_DETECT_DESTROY
|
|
if (!file)
|
|
return;
|
|
|
|
if (safe_mutex_count)
|
|
{
|
|
fprintf(file, "Warning: Not destroyed mutex: %lu\n", safe_mutex_count);
|
|
(void) fflush(file);
|
|
}
|
|
{
|
|
struct st_safe_mutex_info_t *ptr;
|
|
for (ptr= safe_mutex_root ; ptr ; ptr= ptr->next)
|
|
{
|
|
fprintf(file, "\tMutex initiated at line %4u in '%s'\n",
|
|
ptr->init_line, ptr->init_file);
|
|
(void) fflush(file);
|
|
}
|
|
}
|
|
#endif /* SAFE_MUTEX_DETECT_DESTROY */
|
|
}
|
|
|
|
#endif /* THREAD && SAFE_MUTEX */
|