mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
9e6784924a
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb BitKeeper/deleted/.del-SETUP.sh.rej: Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej BitKeeper/deleted/.del-configure.in.rej: Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej BitKeeper/deleted/.del-my_global.h.rej: Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej BitKeeper/deleted/.del-my_pthread.h.rej: Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej BitKeeper/deleted/.del-mysql_client_test.c.rej: Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89: Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89 BitKeeper/deleted/.del-sql_parse.cc.rej: Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej BitKeeper/deleted/.del-table.cc.rej: Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej BitKeeper/deleted/.del-thr_alarm.c.rej: Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej BUILD/compile-pentium64: Update this to be in line with compile-pentium BUILD/compile-pentium: Send command line options to SETUP.sh BUILD/compile-solaris-sparc-debug: Update scripts BUILD/compile-solaris-sparc-forte: Update scripts BUILD/compile-solaris-sparc-purify: Update scripts BUILD/compile-solaris-sparc: Update scripts BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Removed compiler warning BitKeeper/deleted/.del-ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 configure.in: Added detection of port_create and port.h (for future)as --- manual merge BitKeeper/deleted/.del-ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Fixed compiler warnings BitKeeper/etc/ignore: added storage/ndb/src/ndbapi/ndberror_check client/mysqlbinlog.cc: Removed not needed 'static' (caused compiler warning) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Free warning and query memory no abort. (Removes strange warnings on screen if mysql-test-run fails) Removed compiler warnings Portability fix for windows (windows doesn't have mode_t) client/sql_string.h: Removed compiler warning cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/charset2html.c: Fixed compiler warnings extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/lock.hpp: Fix for windows64 extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/include/yassl.hpp: Fix for windows64 extra/yassl/src/ssl.cpp: Removed compiler warning Detect wrong parameter (Happens when running test suite on solaris) Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Removed compiler warning include/config-win.h: Added HAVE_WINSOCK2 (for future) include/my_dbug.h: Fixed DBUG_PROCESS() so that we don't get compiler warnings for it include/my_global.h: Fixed unsafe define of uint4korr() manual merge (ignore changes from 5.0) Fixed warnings on win64 when using int5store and int6store include/my_pthread.h: Added my_thread_id typedef Renamed 'my_thread_id() function to my_thead_dbug_id() include/thr_alarm.h: Make thr_alarm_kill() to depend on thread_id instead of thread include/thr_lock.h: Make thr_abort_locks_for_thread() depend on thread_id instead of thread libmysql/libmysql.def: Fixed compiler warnings on win64 libmysqld/CMakeLists.txt: Added missing files libmysqld/Makefile.am: Added new files libmysqld/lib_sql.cc: Remove not needed code (store_globals() now takes care of things) mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) Fixed typo that caused mysql-test-run.pl to fail on Solaris mysql-test/r/keywords.result: manual merge mysql-test/r/ndb_lock.result: After merge fixes mysql-test/r/ps.result: Portability fix mysql-test/t/disabled.def: Disabled ndb_alter_table as this very often fails for me (and have done it for a long time) mysql-test/t/keywords.test: manual merge mysql-test/t/ndb_lock.test: Added other possible error code mysql-test/t/ps.test: Portability fix (when compiling without DLOPEN) mysql-test/t/wait_timeout.test: Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts) mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings mysys/my_getopt.c: Fixed compiler warning mysys/my_init.c: Fixed compiler warning Re-indented long comment mysys/my_thr_init.c: Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage) Always generate my_thread_name() when using DBUG Ensure mysys_var->pthread_self is set Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build mysys/thr_alarm.c: Change thr_alarm_kill() to use mysys_var->id instead of thread id Fixed compiler warning on windows mysys/thr_lock.c: Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id Add purecov statements around not tested code Fixed compiler warnings mysys/thr_mutex.c: my_thread_id() -> my_thread_dbug_id() server-tools/instance-manager/guardian.cc: Fixed compiler warning server-tools/instance-manager/instance.cc: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/CMakeLists.txt: Added missing files sql/Makefile.am: Added new files sql/event_scheduler.cc: Added pthread_exit() calls Ensure DBUG_xxx calls are not made before my_thread_init() Use common functions to set up thread handling sql/field.h: manual merge sql/ha_ndbcluster.cc: Removed some trivial 'current_thd' calls sql/handler.cc: Avoid warnings on KILL_CONNECTION Don't print out null pointer with printf() (Causes crashes on Solaris) sql/item.cc: Fixed compiler warnings from 'max' build sql/item_cmpfunc.cc: After merge fixes sql/item_func.cc: Merge embedded and normal code usage (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t) Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warnings sql/lock.cc: Use (new) parameter to thr_abort_locks_for_thread() sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warnings about not used variable sql/mysql_priv.h: Remove TEST_NO_THREADS (not needed with new scheduler interface) Added functions from sql_connect.cc and new functions from sql_parse.cc sql/mysqld.cc: Use thread_scheduler structure to dispatch calls (make code more dynamic) Change --one-thread option to use thread_scheduler interface Made ONE_THREAD option independent of DBUG_BUILD --one-thread is now depricated. One should instead use '--thread-handling=no-threads' Remove not used uname() function. Split create_new_thread() into reusable sub functions. Preliminary interface code for future thread_handling code. Fixed compiler warnings sql/parse_file.cc: Don't send zero pointer to fn_format() (Causes crashes when using --debug) sql/repl_failsafe.cc: Setup pseudo_thread_id same way as other code sql/set_var.cc: Added variables 'thread_handling' Prepare for future variable 'thread_pool_size' Fixed compiler warnings sql/set_var.h: Fixed compiler warning sql/slave.cc: Setup pseudo_thread_id same way as other code Removed not used signal mask sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed long comments Normalized variable setup Don't destroy value of thd->variables.pseduo_thread_id More DBUG_PRINT()'s More DBUG_ASSERT()'s Fixed compiler warnings from 'max' build sql/sql_class.cc: Remove thd->real_id and thd->dbug_thread_id Added DBUG_ASSERT() Use thread_scheduler to signal threads to be killed. In THD::store_globals(), set my_thread_var->id to be thd->thread_id. Fixed compiler warnings sql/sql_class.h: Use 'my_thread_id' for internal thread id's Remove not needed THD elements: block_signals and dbug_thread_id Added 'thread_scheduler' scheduling extension element to THD sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) Setup pseudo_thread_id same way as other code Removed not used signal mask Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_parse.cc: Move connection related code to sql_connect.cc Remove setting of signal mask (not needed) Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug) Added previous 'optional' element to reset_mgh() Removed not needed DBUG_PRINT call sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Removed not needed casts Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql-bench/bench-init.pl.sh: Added --one-missing-tests sql-bench/example: Better example sql-bench/run-all-tests.sh: Added --only-missing-tests sql-bench/test-insert.sh: Fixed wrong estimate of update_with_key_prefix sql/sql_show.cc: Don't send pthread_kill() to threads to detect if they exists. (Not that useful and causes problems with future thread_handling code) Fixed compiler warnings sql/sql_table.cc: Simplify code Fixed compiler warnings sql/sql_test.cc: Remove dbug_thread_id from test output sql/sql_view.cc: Don't send zero pointer to fn_format() sql/tztime.cc: Fixed compiler warning sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions storage/archive/archive_test.c: Fixed compiler warnings storage/archive/azio.c: Fixed compiler warnings storage/innobase/dict/dict0crea.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0dict.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0load.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0mem.c: Fixed compiler warnings detected on windows64 storage/innobase/eval/eval0proc.c: Fixed compiler warnings detected on windows64 storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings detected on windows64 storage/innobase/include/ut0byte.ic: Fixed compiler warnings on win64 storage/innobase/include/ut0ut.ic: Fixed compiler warnings on win64 storage/innobase/mtr/mtr0log.c: Fixed compiler warnings detected on windows64 storage/innobase/pars/pars0lex.l: Fixed warnings on win64 storage/innobase/rem/rem0cmp.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0mysql.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0sel.c: Fixed compiler warnings detected on windows64 storage/innobase/sync/sync0rw.c: Fixed compiler warnings detected on windows64 storage/innobase/trx/trx0trx.c: Fixed compiler warnings detected on windows64 storage/myisam/mi_log.c: my_thread_id() -> my_thread_debug_id() storage/myisam/mi_packrec.c: Fixed compiler warnings detected on windows64 storage/myisam/myisamchk.c: Fixed compiler warnings from 'max' build storage/ndb/src/common/debugger/EventLogger.cpp: Fixed compiler warnings storage/ndb/src/common/util/ConfigValues.cpp: Removed compiler warnings storage/ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warnings storage/ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/diskpage.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/main.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/SignalSender.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_strchr.c: Fixed conflict between function and prototype support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build Suppress warnings from bdb and (for the moment) warnings from ndb Suppress all warnings for all pushbuild platforms (should make all trees green) vio/viosslfactories.c: Added DBUG_PRINT BUILD/compile-pentium64-max: New BitKeeper file ``BUILD/compile-pentium64-max'' libmysqld/scheduler.cc: New BitKeeper file ``libmysqld/scheduler.cc'' libmysqld/sql_connect.cc: New BitKeeper file ``libmysqld/sql_connect.cc'' mysql-test/include/one_thread_per_connection.inc: New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc'' mysql-test/r/no-threads.result: New BitKeeper file ``mysql-test/r/no-threads.result'' mysql-test/r/one_thread_per_connection.require: New BitKeeper file ``mysql-test/r/one_thread_per_connection.require'' mysql-test/t/no-threads-master.opt: New BitKeeper file ``mysql-test/t/no-threads-master.opt'' mysql-test/t/no-threads.test: New BitKeeper file ``mysql-test/t/no-threads.test'' sql/scheduler.cc: New BitKeeper file ``sql/scheduler.cc'' sql/scheduler.h: New BitKeeper file ``sql/scheduler.h'' sql/sql_connect.cc: New BitKeeper file ``sql/sql_connect.cc''
435 lines
11 KiB
C
435 lines
11 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; 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 */
|
|
|
|
/* This makes a wrapper for mutex handling to make it easier to debug mutex */
|
|
|
|
#include <my_global.h>
|
|
#if defined(TARGET_OS_LINUX) && !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\n",
|
|
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();
|
|
}
|
|
mp->thread= pthread_self();
|
|
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->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->thread= 0;
|
|
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();
|
|
}
|
|
mp->thread=pthread_self();
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Count was %d in thread 0x%lx when locking mutex at %s, line %d\n",
|
|
mp->count-1, my_thread_dbug_id(), file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
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 && error != ETIME))
|
|
{
|
|
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);
|
|
mp->thread=pthread_self();
|
|
if (mp->count++)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Count was %d in thread 0x%lx when locking mutex at %s, line %d (error: %d (%d))\n",
|
|
mp->count-1, my_thread_dbug_id(), file, line, error, error);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
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->file)
|
|
{
|
|
fprintf(stderr,
|
|
"safe_mutex: Trying to destroy unitialized mutex at %s, line %d\n",
|
|
file, line);
|
|
fflush(stderr);
|
|
abort();
|
|
}
|
|
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 */
|
|
|
|
#if defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX)
|
|
|
|
#include "mysys_priv.h"
|
|
#include "my_static.h"
|
|
#include <m_string.h>
|
|
|
|
#include <m_ctype.h>
|
|
#include <hash.h>
|
|
#include <myisampack.h>
|
|
#include <mysys_err.h>
|
|
#include <my_sys.h>
|
|
|
|
#undef pthread_mutex_t
|
|
#undef pthread_mutex_init
|
|
#undef pthread_mutex_lock
|
|
#undef pthread_mutex_trylock
|
|
#undef pthread_mutex_unlock
|
|
#undef pthread_mutex_destroy
|
|
#undef pthread_cond_wait
|
|
#undef pthread_cond_timedwait
|
|
|
|
ulong mutex_delay(ulong delayloops)
|
|
{
|
|
ulong i;
|
|
volatile ulong j;
|
|
|
|
j = 0;
|
|
|
|
for (i = 0; i < delayloops * 50; i++)
|
|
j += i;
|
|
|
|
return(j);
|
|
}
|
|
|
|
#define MY_PTHREAD_FASTMUTEX_SPINS 8
|
|
#define MY_PTHREAD_FASTMUTEX_DELAY 4
|
|
|
|
int my_pthread_fastmutex_init(my_pthread_fastmutex_t *mp,
|
|
const pthread_mutexattr_t *attr)
|
|
{
|
|
static int cpu_count= 0;
|
|
#ifdef _SC_NPROCESSORS_CONF
|
|
if (!cpu_count && (attr == MY_MUTEX_INIT_FAST))
|
|
cpu_count= sysconf(_SC_NPROCESSORS_CONF);
|
|
#endif
|
|
|
|
if ((cpu_count > 1) && (attr == MY_MUTEX_INIT_FAST))
|
|
mp->spins= MY_PTHREAD_FASTMUTEX_SPINS;
|
|
else
|
|
mp->spins= 0;
|
|
return pthread_mutex_init(&mp->mutex, attr);
|
|
}
|
|
|
|
int my_pthread_fastmutex_lock(my_pthread_fastmutex_t *mp)
|
|
{
|
|
int res;
|
|
uint i;
|
|
uint maxdelay= MY_PTHREAD_FASTMUTEX_DELAY;
|
|
|
|
for (i= 0; i < mp->spins; i++)
|
|
{
|
|
res= pthread_mutex_trylock(&mp->mutex);
|
|
|
|
if (res == 0)
|
|
return 0;
|
|
|
|
if (res != EBUSY)
|
|
return res;
|
|
|
|
mutex_delay(maxdelay);
|
|
maxdelay += ((double) random() / (double) RAND_MAX) *
|
|
MY_PTHREAD_FASTMUTEX_DELAY + 1;
|
|
}
|
|
return pthread_mutex_lock(&mp->mutex);
|
|
}
|
|
#endif /* defined(THREAD) && defined(MY_PTHREAD_FASTMUTEX) && !defined(SAFE_MUTEX) */
|