mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
f01f49916b
Fixed bugs in my last changeset that made MySQL hard to compile. Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables. Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions Extended my_chsize() to allow one to specify a filler character. Extend vio_blocking to return the old state (This made some usage of this function much simpler) Added testing for some functions that they caller have got the required mutexes before calling the function. Use setrlimit() to ensure that we can write core file if one specifies --core-file. Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len Added variables foreign_key_checks & unique_checks. Less logging from replication code (if not started with --log-warnings) Changed that SHOW INNODB STATUS requre the SUPER privilege More DBUG statements and a lot of new code comments BitKeeper/deleted/.del-rpl_compat.result~c950bc346b12c61a: Delete: mysql-test/r/rpl_compat.result BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f: Delete: mysql-test/t/rpl_compat.test Docs/manual.texi: Updated manual with fixes in this changeset client/mysqltest.c: Indentation cleanup Better error messages for some error conditions. include/my_pthread.h: Added 'safe_mutex_assert_owner()' to check that the thread really owns the mutex. include/my_sys.h: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) include/raid.h: New my_chsize() include/violite.h: Extend vio_blocking to return the old state innobase/include/dyn0dyn.h: Merge with 3.23 (AIX DYN_ARRAY_DATA_SIZE) innobase/include/dyn0dyn.ic: Merge with 3.23 isam/create.c: Fix for new my_chsize() isam/isamchk.c: Fix for new my_chsize() isam/pack_isam.c: Fix for new my_chsize() libmysql/manager.c: Fix for new vio_blocking() libmysqld/lib_sql.cc: Fix for new open_log() myisam/mi_cache.c: Fix typo from previous checking myisam/mi_check.c: Fix for new my_chsize() myisam/mi_create.c: Fix for new my_chsize() myisam/mi_delete_all.c: Fix for new my_chsize() myisam/myisampack.c: Fix for new my_chsize() mysql-test/include/master-slave.inc: Better initialization for replication tests mysql-test/mysql-test-run.sh: Added option --log-warnings mysql-test/r/insert.result: More tests if INSERT ...(DEFAULT) mysql-test/r/rpl000001.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000002.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000003.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000004.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000005.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000006.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000007.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000008.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000009.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000010.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000011.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000012.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000013.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl000014.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_alter.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_empty_master_crash.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_get_lock.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_log.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_magic.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_mystery22.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_skip_error.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/r/rpl_sporadic_master.result: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/insert.test: More tests if INSERT ...(DEFAULT) mysql-test/t/rpl000001.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000002.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000003.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000004.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000005.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000006.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000007.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000009.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000011.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000013.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl000014.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_alter.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_empty_master_crash.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_get_lock.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_magic.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_mystery22.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_skip_error.test: Clean up tests for new master-slave.inc Remove 'use database' mysql-test/t/rpl_sporadic_master.test: Clean up tests for new master-slave.inc Remove 'use database' mysys/mf_iocache.c: More debug info Force seek after reinit_io_cache() mysys/mf_iocache2.c: Added my_b_filelength() mysys/my_chsize.c: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) mysys/raid.cc: Extended my_chsize() to allow one to specify a filler character. (For MySQL index logs) sql/field.h: Fix for INSERT ... (DEFAULT) sql/ha_berkeley.h: Fix for dynamic variables sql/ha_innodb.cc: Change sprintf() to my_sprintf() to make code portable. Fix after sync with 3.23 (We still need to fix the storage of the replication position in innodb) sql/ha_innodb.h: Fix for dynamic variables sql/handler.cc: Remove writting of COMMIT to the binary log. (Now done in MYSQL_LOG::write()) sql/item_func.cc: Query_log_event() now always takes query length. sql/item_func.h: Indentation cleanup sql/item_strfunc.h: Indentation cleanup sql/item_timefunc.h: Indentation cleanup sql/lock.cc: Check that we own critical mutexes. sql/log.cc: Big code cleanup / rewrite / optimize. - The index log file has its own IO_CACHE object. - Many functions totally rewritten to make them smaller and faster. - New handling of index log files - Lots of new comments sql/log_event.cc: Code cleanup New comments sql/log_event.h: Query_log_event() now always takes query length. sql/mini_client.cc: Better error messages on reconnect. Fixed wrong variable usage from last commit. sql/mysql_priv.h: New arguments to open_log() sql/mysqld.cc: Use setrlimit() to ensure that we can write core file if one specifies --core-file Added index file name as parameter to openlog(). Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len sql/net_serv.cc: Use new vio_blocking() (The vio_blocking() change was done to make this code more readable) sql/repl_failsafe.cc: Minor code cleanup sql/set_var.cc: Added variables slave_compressed_protocol, foreign_key_checks & unique_checks. sql/set_var.h: Generalization sql/slave.cc: Code cleanup & rewrite. Dont call SELECT VERSION() on check_master_version() New init_slave() code. Ensure that all threads create a THD early. Add locks around manipulation of critical structures Don't retry a command more than master_retry_count times. Write less warnings to the log file (if not started with --log-warnings) Faster flush_relay_log_info() sql/slave.h: More comments Added new arguments to some functions. sql/sql_acl.cc: More DBUG info New parameter to Query_log_event() sql/sql_base.cc: Added some mutex checking. sql/sql_cache.cc: Less not critical debug info sql/sql_class.h: Fix for new log handling. sql/sql_db.cc: Added mutex around remove_db_from_cache() sql/sql_delete.cc: Added missing parameters to changed functions sql/sql_insert.cc: Added missing parameters to changed functions sql/sql_parse.cc: Do an 'end_active_trans()' before 'load_master_data' Changed that SHOW INNODB STATUS requre the SUPER privilege Added new function parameters to new functions sql/sql_rename.cc: Added missing parameters to changed functions sql/sql_repl.cc: Code cleanups / new comments Fix for new find_first_log() calling standard. More DBUG statements. Show binlogs updated to use new IO_CACHE:d index log file. sql/sql_repl.h: New function arguments sql/sql_select.cc: Indentation changes sql/sql_table.cc: Added missing parameters to changed functions Added checking of mutex Added mutex around critical regions. sql/sql_test.cc: Don't use THR_ALARM if the configuration doesn't support it. sql/sql_update.cc: Added missing parameters to changed functions sql/table.cc: Added missing parameters to changed functions vio/vio.c: Extend vio_blocking to return the old state vio/viosocket.c: Extend vio_blocking to return the old state vio/viossl.c: Extend vio_blocking to return the old state
634 lines
22 KiB
C
634 lines
22 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 */
|
|
|
|
/* Defines to make different thread packages compatible */
|
|
|
|
#ifndef _my_pthread_h
|
|
#define _my_pthread_h
|
|
|
|
#include <errno.h>
|
|
#ifndef ETIME
|
|
#define ETIME ETIMEDOUT /* For FreeBSD */
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
#if defined(__WIN__) || defined(OS2)
|
|
|
|
#ifdef OS2
|
|
typedef ULONG HANDLE;
|
|
typedef ULONG DWORD;
|
|
typedef int sigset_t;
|
|
#endif
|
|
|
|
#ifdef OS2
|
|
typedef HMTX pthread_mutex_t;
|
|
#else
|
|
typedef CRITICAL_SECTION pthread_mutex_t;
|
|
#endif
|
|
typedef HANDLE pthread_t;
|
|
typedef struct thread_attr {
|
|
DWORD dwStackSize ;
|
|
DWORD dwCreatingFlag ;
|
|
int priority ;
|
|
} pthread_attr_t ;
|
|
|
|
typedef struct { int dummy; } pthread_condattr_t;
|
|
|
|
/* Implementation of posix conditions */
|
|
|
|
typedef struct st_pthread_link {
|
|
DWORD thread_id;
|
|
struct st_pthread_link *next;
|
|
} pthread_link;
|
|
|
|
typedef struct {
|
|
uint32 waiting;
|
|
#ifdef OS2
|
|
HEV semaphore;
|
|
#else
|
|
HANDLE semaphore;
|
|
#endif
|
|
} pthread_cond_t;
|
|
|
|
|
|
#ifndef OS2
|
|
struct timespec { /* For pthread_cond_timedwait() */
|
|
time_t tv_sec;
|
|
long tv_nsec;
|
|
};
|
|
#endif
|
|
|
|
typedef int pthread_mutexattr_t;
|
|
#define win_pthread_self my_thread_var->pthread_self
|
|
#ifdef OS2
|
|
#define pthread_handler_decl(A,B) void * _Optlink A(void *B)
|
|
typedef void * (_Optlink *pthread_handler)(void *);
|
|
#else
|
|
#define pthread_handler_decl(A,B) void * __cdecl A(void *B)
|
|
typedef void * (__cdecl *pthread_handler)(void *);
|
|
#endif
|
|
|
|
void win_pthread_init(void);
|
|
int win_pthread_setspecific(void *A,void *B,uint length);
|
|
int pthread_create(pthread_t *,pthread_attr_t *,pthread_handler,void *);
|
|
int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
|
|
int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
|
|
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|
struct timespec *abstime);
|
|
int pthread_cond_signal(pthread_cond_t *cond);
|
|
int pthread_cond_broadcast(pthread_cond_t *cond);
|
|
int pthread_cond_destroy(pthread_cond_t *cond);
|
|
int pthread_attr_init(pthread_attr_t *connect_att);
|
|
int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
|
|
int pthread_attr_setprio(pthread_attr_t *connect_att,int priority);
|
|
int pthread_attr_destroy(pthread_attr_t *connect_att);
|
|
struct tm *localtime_r(const time_t *timep,struct tm *tmp);
|
|
|
|
void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/
|
|
|
|
#ifndef OS2
|
|
#define ETIMEDOUT 145 /* Win32 doesn't have this */
|
|
#define getpid() GetCurrentThreadId()
|
|
#endif
|
|
#define pthread_self() win_pthread_self
|
|
#define HAVE_LOCALTIME_R 1
|
|
#define _REENTRANT 1
|
|
#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
|
|
|
|
#ifdef USE_TLS /* For LIBMYSQL.DLL */
|
|
#undef SAFE_MUTEX /* This will cause conflicts */
|
|
#define pthread_key(T,V) DWORD V
|
|
#define pthread_key_create(A,B) ((*A=TlsAlloc())==0xFFFFFFFF)
|
|
#define pthread_getspecific(A) (TlsGetValue(A))
|
|
#define my_pthread_getspecific(T,A) ((T) TlsGetValue(A))
|
|
#define my_pthread_getspecific_ptr(T,V) ((T) TlsGetValue(V))
|
|
#define my_pthread_setspecific_ptr(T,V) (!TlsSetValue((T),(V)))
|
|
#define pthread_setspecific(A,B) (!TlsSetValue((A),(B)))
|
|
#else
|
|
#define pthread_key(T,V) __declspec(thread) T V
|
|
#define pthread_key_create(A,B) pthread_dummy(0)
|
|
#define pthread_getspecific(A) (&(A))
|
|
#define my_pthread_getspecific(T,A) (&(A))
|
|
#define my_pthread_getspecific_ptr(T,V) (V)
|
|
#define my_pthread_setspecific_ptr(T,V) ((T)=(V),0)
|
|
#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))
|
|
#endif /* USE_TLS */
|
|
|
|
#define pthread_equal(A,B) ((A) == (B))
|
|
#ifdef OS2
|
|
extern int pthread_mutex_init (pthread_mutex_t *, const pthread_mutexattr_t *);
|
|
extern int pthread_mutex_lock (pthread_mutex_t *);
|
|
extern int pthread_mutex_unlock (pthread_mutex_t *);
|
|
extern int pthread_mutex_destroy (pthread_mutex_t *);
|
|
#define my_pthread_setprio(A,B) DosSetPriority(PRTYS_THREAD,PRTYC_NOCHANGE, B, A)
|
|
#define pthread_kill(A,B) raise(B)
|
|
#define pthread_exit(A) pthread_dummy()
|
|
#else
|
|
#define pthread_mutex_init(A,B) InitializeCriticalSection(A)
|
|
#define pthread_mutex_lock(A) (EnterCriticalSection(A),0)
|
|
#define pthread_mutex_trylock(A) (WaitForSingleObject((A), 0) == WAIT_TIMEOUT)
|
|
#define pthread_mutex_unlock(A) LeaveCriticalSection(A)
|
|
#define pthread_mutex_destroy(A) DeleteCriticalSection(A)
|
|
#define my_pthread_setprio(A,B) SetThreadPriority(GetCurrentThread(), (B))
|
|
#define pthread_kill(A,B) pthread_dummy(0)
|
|
#endif /* OS2 */
|
|
|
|
/* Dummy defines for easier code */
|
|
#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
|
|
#define my_pthread_attr_setprio(A,B) pthread_attr_setprio(A,B)
|
|
#define pthread_attr_setscope(A,B)
|
|
#define pthread_detach_this_thread()
|
|
#define pthread_condattr_init(A)
|
|
#define pthread_condattr_destroy(A)
|
|
|
|
/*Irena: compiler does not like this: */
|
|
/*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */
|
|
#define my_pthread_getprio(thread_id) pthread_dummy(0)
|
|
|
|
#elif defined(HAVE_UNIXWARE7_THREADS)
|
|
|
|
#include <thread.h>
|
|
#include <synch.h>
|
|
|
|
#ifndef _REENTRANT
|
|
#define _REENTRANT
|
|
#endif
|
|
|
|
#define HAVE_NONPOSIX_SIGWAIT
|
|
#define pthread_t thread_t
|
|
#define pthread_cond_t cond_t
|
|
#define pthread_mutex_t mutex_t
|
|
#define pthread_key_t thread_key_t
|
|
typedef int pthread_attr_t; /* Needed by Unixware 7.0.0 */
|
|
|
|
#define pthread_key_create(A,B) thr_keycreate((A),(B))
|
|
|
|
#define pthread_handler_decl(A,B) void *A(void *B)
|
|
#define pthread_key(T,V) pthread_key_t V
|
|
|
|
void * my_pthread_getspecific_imp(pthread_key_t key);
|
|
#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
|
|
#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,V)
|
|
|
|
#define pthread_setspecific(A,B) thr_setspecific(A,B)
|
|
#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,V)
|
|
|
|
#define pthread_create(A,B,C,D) thr_create(NULL,65536L,(C),(D),THR_DETACHED,(A))
|
|
#define pthread_cond_init(a,b) cond_init((a),USYNC_THREAD,NULL)
|
|
#define pthread_cond_destroy(a) cond_destroy(a)
|
|
#define pthread_cond_signal(a) cond_signal(a)
|
|
#define pthread_cond_wait(a,b) cond_wait((a),(b))
|
|
#define pthread_cond_timedwait(a,b,c) cond_timedwait((a),(b),(c))
|
|
#define pthread_cond_broadcast(a) cond_broadcast(a)
|
|
|
|
#define pthread_mutex_init(a,b) mutex_init((a),USYNC_THREAD,NULL)
|
|
#define pthread_mutex_lock(a) mutex_lock(a)
|
|
#define pthread_mutex_unlock(a) mutex_unlock(a)
|
|
#define pthread_mutex_destroy(a) mutex_destroy(a)
|
|
|
|
#define pthread_self() thr_self()
|
|
#define pthread_exit(A) thr_exit(A)
|
|
#define pthread_equal(A,B) (((A) == (B)) ? 1 : 0)
|
|
#define pthread_kill(A,B) thr_kill((A),(B))
|
|
#define HAVE_PTHREAD_KILL
|
|
|
|
#define pthread_sigmask(A,B,C) thr_sigsetmask((A),(B),(C))
|
|
|
|
extern int my_sigwait(const sigset_t *set,int *sig);
|
|
|
|
#define pthread_detach_this_thread() pthread_dummy(0)
|
|
|
|
#define pthread_attr_init(A) pthread_dummy(0)
|
|
#define pthread_attr_destroy(A) pthread_dummy(0)
|
|
#define pthread_attr_setscope(A,B) pthread_dummy(0)
|
|
#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
|
|
#define my_pthread_setprio(A,B) pthread_dummy (0)
|
|
#define my_pthread_getprio(A) pthread_dummy (0)
|
|
#define my_pthread_attr_setprio(A,B) pthread_dummy(0)
|
|
|
|
#else /* Normal threads */
|
|
|
|
#ifdef HAVE_rts_threads
|
|
#define sigwait org_sigwait
|
|
#include <signal.h>
|
|
#undef sigwait
|
|
#endif
|
|
#undef _REENTRANT /* Fix if _REENTRANT is in pthread.h */
|
|
#include <pthread.h>
|
|
#ifndef _REENTRANT
|
|
#define _REENTRANT
|
|
#endif
|
|
#ifdef HAVE_THR_SETCONCURRENCY
|
|
#include <thread.h> /* Probably solaris */
|
|
#endif
|
|
#ifdef HAVE_SCHED_H
|
|
#include <sched.h>
|
|
#endif
|
|
#ifdef HAVE_SYNCH_H
|
|
#include <synch.h>
|
|
#endif
|
|
#if defined(__EMX__) && (!defined(EMX_PTHREAD_REV) || (EMX_PTHREAD_REV < 2))
|
|
#error Requires at least rev 2 of EMX pthreads library.
|
|
#endif
|
|
|
|
extern int my_pthread_getprio(pthread_t thread_id);
|
|
|
|
#define pthread_key(T,V) pthread_key_t V
|
|
#define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V))
|
|
#define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V))
|
|
#define pthread_detach_this_thread()
|
|
#define pthread_handler_decl(A,B) void *A(void *B)
|
|
typedef void *(* pthread_handler)(void *);
|
|
|
|
/* Test first for RTS or FSU threads */
|
|
|
|
#if defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM)
|
|
#define HAVE_rts_threads
|
|
extern int my_pthread_create_detached;
|
|
#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
|
|
#define PTHREAD_CREATE_DETACHED &my_pthread_create_detached
|
|
#define PTHREAD_SCOPE_SYSTEM PTHREAD_SCOPE_GLOBAL
|
|
#define PTHREAD_SCOPE_PROCESS PTHREAD_SCOPE_LOCAL
|
|
#define USE_ALARM_THREAD
|
|
#elif defined(HAVE_mit_thread)
|
|
#define USE_ALARM_THREAD
|
|
#undef HAVE_LOCALTIME_R
|
|
#define HAVE_LOCALTIME_R
|
|
#undef HAVE_PTHREAD_ATTR_SETSCOPE
|
|
#define HAVE_PTHREAD_ATTR_SETSCOPE
|
|
#undef HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE /* If we are running linux */
|
|
#undef HAVE_RWLOCK_T
|
|
#undef HAVE_RWLOCK_INIT
|
|
#undef HAVE_PTHREAD_RWLOCK_RDLOCK
|
|
#undef HAVE_SNPRINTF
|
|
|
|
#define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
|
|
#define signal(A,B) pthread_signal((A),(void (*)(int)) (B))
|
|
#define my_pthread_attr_setprio(A,B)
|
|
#endif /* defined(PTHREAD_SCOPE_GLOBAL) && !defined(PTHREAD_SCOPE_SYSTEM) */
|
|
|
|
#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199910
|
|
int sigwait(sigset_t *set, int *sig);
|
|
#endif
|
|
|
|
#if defined(HAVE_UNIXWARE7_POSIX)
|
|
#undef HAVE_NONPOSIX_SIGWAIT
|
|
#define HAVE_NONPOSIX_SIGWAIT /* sigwait takes only 1 argument */
|
|
#endif
|
|
|
|
#ifndef HAVE_NONPOSIX_SIGWAIT
|
|
#define my_sigwait(A,B) sigwait((A),(B))
|
|
#else
|
|
int my_sigwait(const sigset_t *set,int *sig);
|
|
#endif
|
|
|
|
#ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT
|
|
#ifndef SAFE_MUTEX
|
|
#define pthread_mutex_init(a,b) my_pthread_mutex_init((a),(b))
|
|
extern int my_pthread_mutex_init(pthread_mutex_t *mp,
|
|
const pthread_mutexattr_t *attr);
|
|
#endif /* SAFE_MUTEX */
|
|
#define pthread_cond_init(a,b) my_pthread_cond_init((a),(b))
|
|
extern int my_pthread_cond_init(pthread_cond_t *mp,
|
|
const pthread_condattr_t *attr);
|
|
#endif /* HAVE_NONPOSIX_PTHREAD_MUTEX_INIT */
|
|
|
|
#if defined(HAVE_SIGTHREADMASK) && !defined(HAVE_PTHREAD_SIGMASK)
|
|
#define pthread_sigmask(A,B,C) sigthreadmask((A),(B),(C))
|
|
#endif
|
|
|
|
#if !defined(HAVE_SIGWAIT) && !defined(HAVE_mit_thread) && !defined(HAVE_rts_threads) && !defined(sigwait) && !defined(alpha_linux_port) && !defined(HAVE_NONPOSIX_SIGWAIT) && !defined(HAVE_DEC_3_2_THREADS) && !defined(_AIX)
|
|
int sigwait(sigset_t *setp, int *sigp); /* Use our implemention */
|
|
#endif
|
|
#if !defined(HAVE_SIGSET) && !defined(HAVE_mit_thread) && !defined(sigset)
|
|
#define sigset(A,B) do { struct sigaction s; sigset_t set; \
|
|
sigemptyset(&set); \
|
|
s.sa_handler = (B); \
|
|
s.sa_mask = set; \
|
|
s.sa_flags = 0; \
|
|
sigaction((A), &s, (struct sigaction *) NULL); \
|
|
} while (0)
|
|
#endif
|
|
|
|
#ifndef my_pthread_setprio
|
|
#if defined(HAVE_PTHREAD_SETPRIO_NP) /* FSU threads */
|
|
#define my_pthread_setprio(A,B) pthread_setprio_np((A),(B))
|
|
#elif defined(HAVE_PTHREAD_SETPRIO)
|
|
#define my_pthread_setprio(A,B) pthread_setprio((A),(B))
|
|
#else
|
|
extern void my_pthread_setprio(pthread_t thread_id,int prior);
|
|
#endif
|
|
#endif
|
|
|
|
#ifndef my_pthread_attr_setprio
|
|
#ifdef HAVE_PTHREAD_ATTR_SETPRIO
|
|
#define my_pthread_attr_setprio(A,B) pthread_attr_setprio((A),(B))
|
|
#else
|
|
extern void my_pthread_attr_setprio(pthread_attr_t *attr, int priority);
|
|
#endif
|
|
#endif
|
|
|
|
#if !defined(HAVE_PTHREAD_ATTR_SETSCOPE) || defined(HAVE_DEC_3_2_THREADS)
|
|
#define pthread_attr_setscope(A,B)
|
|
#undef HAVE_GETHOSTBYADDR_R /* No definition */
|
|
#endif
|
|
|
|
#if defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) && !defined(SAFE_MUTEX)
|
|
extern int my_pthread_cond_timedwait(pthread_cond_t *cond,
|
|
pthread_mutex_t *mutex,
|
|
struct timespec *abstime);
|
|
#define pthread_cond_timedwait(A,B,C) my_pthread_cond_timedwait((A),(B),(C))
|
|
#endif
|
|
|
|
#if defined(OS2)
|
|
#define my_pthread_getspecific(T,A) ((T) &(A))
|
|
#define pthread_setspecific(A,B) win_pthread_setspecific(&(A),(B),sizeof(A))
|
|
#elif !defined( HAVE_NONPOSIX_PTHREAD_GETSPECIFIC)
|
|
#define my_pthread_getspecific(A,B) ((A) pthread_getspecific(B))
|
|
#else
|
|
#define my_pthread_getspecific(A,B) ((A) my_pthread_getspecific_imp(B))
|
|
void *my_pthread_getspecific_imp(pthread_key_t key);
|
|
#endif /* OS2 */
|
|
|
|
#ifndef HAVE_LOCALTIME_R
|
|
struct tm *localtime_r(const time_t *clock, struct tm *res);
|
|
#endif
|
|
|
|
#ifdef HAVE_PTHREAD_CONDATTR_CREATE
|
|
/* DCE threads on HPUX 10.20 */
|
|
#define pthread_condattr_init pthread_condattr_create
|
|
#define pthread_condattr_destroy pthread_condattr_delete
|
|
#endif
|
|
|
|
#ifdef HAVE_CTHREADS_WRAPPER /* For MacOSX */
|
|
#define pthread_cond_destroy(A) pthread_dummy(0)
|
|
#define pthread_mutex_destroy(A) pthread_dummy(0)
|
|
#define pthread_attr_delete(A) pthread_dummy(0)
|
|
#define pthread_condattr_delete(A) pthread_dummy(0)
|
|
#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
|
|
#define pthread_equal(A,B) ((A) == (B))
|
|
#define pthread_cond_timedwait(a,b,c) pthread_cond_wait((a),(b))
|
|
#define pthread_attr_init(A) pthread_attr_create(A)
|
|
#define pthread_attr_destroy(A) pthread_attr_delete(A)
|
|
#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
|
|
#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))
|
|
#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
|
|
#define pthread_kill(A,B) pthread_dummy(0)
|
|
#undef pthread_detach_this_thread
|
|
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
|
|
#endif
|
|
|
|
#ifdef HAVE_DARWIN_THREADS
|
|
#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
|
|
#define pthread_kill(A,B) pthread_dummy(0)
|
|
#define pthread_condattr_init(A) pthread_dummy(0)
|
|
#define pthread_condattr_destroy(A) pthread_dummy(0)
|
|
#define pthread_signal(A,B) pthread_dummy(0)
|
|
#undef pthread_detach_this_thread
|
|
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); }
|
|
#undef sigset
|
|
#define sigset(A,B) pthread_signal((A),(void (*)(int)) (B))
|
|
#endif
|
|
|
|
#if ((defined(HAVE_PTHREAD_ATTR_CREATE) && !defined(HAVE_SIGWAIT)) || defined(HAVE_DEC_3_2_THREADS)) && !defined(HAVE_CTHREADS_WRAPPER)
|
|
/* This is set on AIX_3_2 and Siemens unix (and DEC OSF/1 3.2 too) */
|
|
#define pthread_key_create(A,B) \
|
|
pthread_keycreate(A,(B) ?\
|
|
(pthread_destructor_t) (B) :\
|
|
(pthread_destructor_t) pthread_dummy)
|
|
#define pthread_attr_init(A) pthread_attr_create(A)
|
|
#define pthread_attr_destroy(A) pthread_attr_delete(A)
|
|
#define pthread_attr_setdetachstate(A,B) pthread_dummy(0)
|
|
#define pthread_create(A,B,C,D) pthread_create((A),*(B),(C),(D))
|
|
#ifndef pthread_sigmask
|
|
#define pthread_sigmask(A,B,C) sigprocmask((A),(B),(C))
|
|
#endif
|
|
#define pthread_kill(A,B) pthread_dummy(0)
|
|
#undef pthread_detach_this_thread
|
|
#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(&tmp); }
|
|
#else /* HAVE_PTHREAD_ATTR_CREATE && !HAVE_SIGWAIT */
|
|
#define HAVE_PTHREAD_KILL
|
|
#endif
|
|
|
|
#endif /* defined(__WIN__) */
|
|
|
|
#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
|
|
#undef pthread_cond_timedwait
|
|
#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
|
|
#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))
|
|
int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
|
struct timespec *abstime);
|
|
int my_pthread_mutex_trylock(pthread_mutex_t *mutex);
|
|
#endif
|
|
|
|
/* safe_mutex adds checking to mutex for easier debugging */
|
|
|
|
typedef struct st_safe_mutex_t
|
|
{
|
|
pthread_mutex_t global,mutex;
|
|
char *file;
|
|
uint line,count;
|
|
pthread_t thread;
|
|
} safe_mutex_t;
|
|
|
|
int safe_mutex_init(safe_mutex_t *mp, const pthread_mutexattr_t *attr);
|
|
int safe_mutex_lock(safe_mutex_t *mp,const char *file, uint line);
|
|
int safe_mutex_unlock(safe_mutex_t *mp,const char *file, uint line);
|
|
int safe_mutex_destroy(safe_mutex_t *mp,const char *file, uint line);
|
|
int safe_cond_wait(pthread_cond_t *cond, safe_mutex_t *mp,const char *file,
|
|
uint line);
|
|
int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,
|
|
struct timespec *abstime, const char *file, uint line);
|
|
|
|
/* Wrappers if safe mutex is actually used */
|
|
#ifdef SAFE_MUTEX
|
|
#undef pthread_mutex_init
|
|
#undef pthread_mutex_lock
|
|
#undef pthread_mutex_unlock
|
|
#undef pthread_mutex_destroy
|
|
#undef pthread_mutex_wait
|
|
#undef pthread_mutex_timedwait
|
|
#undef pthread_mutex_t
|
|
#undef pthread_cond_wait
|
|
#undef pthread_cond_timedwait
|
|
#undef pthread_mutex_trylock
|
|
#define pthread_mutex_init(A,B) safe_mutex_init((A),(B))
|
|
#define pthread_mutex_lock(A) safe_mutex_lock((A),__FILE__,__LINE__)
|
|
#define pthread_mutex_unlock(A) safe_mutex_unlock((A),__FILE__,__LINE__)
|
|
#define pthread_mutex_destroy(A) safe_mutex_destroy((A),__FILE__,__LINE__)
|
|
#define pthread_cond_wait(A,B) safe_cond_wait((A),(B),__FILE__,__LINE__)
|
|
#define pthread_cond_timedwait(A,B,C) safe_cond_timedwait((A),(B),(C),__FILE__,__LINE__)
|
|
#define pthread_mutex_trylock(A) pthread_mutex_lock(A)
|
|
#define pthread_mutex_t safe_mutex_t
|
|
#define safe_mutex_assert_owner(mp) DBUG_ASSERT((mp)->count > 0 && pthread_equal(pthread_self(),(mp)->thread))
|
|
#else
|
|
#define safe_mutex_assert_owner(mp)
|
|
#endif /* SAFE_MUTEX */
|
|
|
|
/* READ-WRITE thread locking */
|
|
|
|
#if defined(USE_MUTEX_INSTEAD_OF_RW_LOCKS)
|
|
/* use these defs for simple mutex locking */
|
|
#define rw_lock_t pthread_mutex_t
|
|
#define my_rwlock_init(A,B) pthread_mutex_init((A),(B))
|
|
#define rw_rdlock(A) pthread_mutex_lock((A))
|
|
#define rw_wrlock(A) pthread_mutex_lock((A))
|
|
#define rw_tryrdlock(A) pthread_mutex_trylock((A))
|
|
#define rw_trywrlock(A) pthread_mutex_trylock((A))
|
|
#define rw_unlock(A) pthread_mutex_unlock((A))
|
|
#define rwlock_destroy(A) pthread_mutex_destroy((A))
|
|
#elif defined(HAVE_PTHREAD_RWLOCK_RDLOCK)
|
|
#define rw_lock_t pthread_rwlock_t
|
|
#define my_rwlock_init(A,B) pthread_rwlock_init((A),(B))
|
|
#define rw_rdlock(A) pthread_rwlock_rdlock(A)
|
|
#define rw_wrlock(A) pthread_rwlock_wrlock(A)
|
|
#define rw_tryrdlock(A) pthread_rwlock_tryrdlock((A))
|
|
#define rw_trywrlock(A) pthread_rwlock_trywrlock((A))
|
|
#define rw_unlock(A) pthread_rwlock_unlock(A)
|
|
#define rwlock_destroy(A) pthread_rwlock_destroy(A)
|
|
#elif defined(HAVE_RWLOCK_INIT)
|
|
#ifdef HAVE_RWLOCK_T /* For example Solaris 2.6-> */
|
|
#define rw_lock_t rwlock_t
|
|
#endif
|
|
#define my_rwlock_init(A,B) rwlock_init((A),USYNC_THREAD,0)
|
|
#else
|
|
/* Use our own version of read/write locks */
|
|
typedef struct _my_rw_lock_t {
|
|
pthread_mutex_t lock; /* lock for structure */
|
|
pthread_cond_t readers; /* waiting readers */
|
|
pthread_cond_t writers; /* waiting writers */
|
|
int state; /* -1:writer,0:free,>0:readers */
|
|
int waiters; /* number of waiting writers */
|
|
} my_rw_lock_t;
|
|
|
|
#define rw_lock_t my_rw_lock_t
|
|
#define rw_rdlock(A) my_rw_rdlock((A))
|
|
#define rw_wrlock(A) my_rw_wrlock((A))
|
|
#define rw_tryrdlock(A) my_rw_tryrdlock((A))
|
|
#define rw_trywrlock(A) my_rw_trywrlock((A))
|
|
#define rw_unlock(A) my_rw_unlock((A))
|
|
#define rwlock_destroy(A) my_rwlock_destroy((A))
|
|
|
|
extern int my_rwlock_init(my_rw_lock_t *, void *);
|
|
extern int my_rwlock_destroy(my_rw_lock_t *);
|
|
extern int my_rw_rdlock(my_rw_lock_t *);
|
|
extern int my_rw_wrlock(my_rw_lock_t *);
|
|
extern int my_rw_unlock(my_rw_lock_t *);
|
|
extern int my_rw_tryrdlock(my_rw_lock_t *);
|
|
extern int my_rw_trywrlock(my_rw_lock_t *);
|
|
#endif /* USE_MUTEX_INSTEAD_OF_RW_LOCKS */
|
|
|
|
#define GETHOSTBYADDR_BUFF_SIZE 2048
|
|
|
|
#ifndef HAVE_THR_SETCONCURRENCY
|
|
#define thr_setconcurrency(A) pthread_dummy(0)
|
|
#endif
|
|
#if !defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE) && ! defined(pthread_attr_setstacksize)
|
|
#define pthread_attr_setstacksize(A,B) pthread_dummy(0)
|
|
#endif
|
|
|
|
/* Define mutex types */
|
|
#define MY_MUTEX_INIT_SLOW NULL
|
|
#define MY_MUTEX_INIT_FAST NULL
|
|
#define MY_MUTEX_INIT_ERRCHK NULL
|
|
#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
|
|
extern pthread_mutexattr_t my_fast_mutexattr;
|
|
#undef MY_MUTEX_INIT_FAST
|
|
#define MY_MUTEX_INIT_FAST &my_fast_mutexattr
|
|
#endif
|
|
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
|
|
extern pthread_mutexattr_t my_errchk_mutexattr;
|
|
#undef MY_INIT_MUTEX_ERRCHK
|
|
#define MY_INIT_MUTEX_ERRCHK &my_errchk_mutexattr
|
|
#endif
|
|
|
|
extern my_bool my_thread_global_init(void);
|
|
extern void my_thread_global_end(void);
|
|
extern my_bool my_thread_init(void);
|
|
extern void my_thread_end(void);
|
|
extern const char *my_thread_name(void);
|
|
extern long my_thread_id(void);
|
|
extern int pthread_no_free(void *);
|
|
extern int pthread_dummy(int);
|
|
|
|
/* All thread specific variables are in the following struct */
|
|
|
|
#define THREAD_NAME_SIZE 10
|
|
#if defined(__ia64__)
|
|
#define DEFAULT_THREAD_STACK (128*1024)
|
|
#else
|
|
#define DEFAULT_THREAD_STACK (64*1024)
|
|
#endif
|
|
|
|
struct st_my_thread_var
|
|
{
|
|
int thr_errno;
|
|
pthread_cond_t suspend;
|
|
pthread_mutex_t mutex;
|
|
pthread_mutex_t * volatile current_mutex;
|
|
pthread_cond_t * volatile current_cond;
|
|
pthread_t pthread_self;
|
|
long id;
|
|
int cmp_length;
|
|
int volatile abort;
|
|
#ifndef DBUG_OFF
|
|
gptr dbug;
|
|
char name[THREAD_NAME_SIZE+1];
|
|
#endif
|
|
};
|
|
|
|
extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
|
|
#define my_thread_var (_my_thread_var())
|
|
#define my_errno my_thread_var->thr_errno
|
|
/*
|
|
Keep track of shutdown,signal, and main threads so that my_end() will not
|
|
report errors with them
|
|
*/
|
|
extern pthread_t shutdown_th, main_th, signal_th;
|
|
|
|
/* statistics_xxx functions are for not essential statistic */
|
|
|
|
#ifndef thread_safe_increment
|
|
#ifdef HAVE_ATOMIC_ADD
|
|
#define thread_safe_increment(V,L) atomic_add(1,(atomic_t*) &V);
|
|
#define thread_safe_add(V,C,L) atomic_add((C),(atomic_t*) &V);
|
|
#define thread_safe_sub(V,C,L) atomic_sub((C),(atomic_t*) &V);
|
|
#define statistic_increment(V,L) thread_safe_increment((V),(L))
|
|
#define statistic_add(V,C,L) thread_safe_add((V),(C),(L))
|
|
#else
|
|
#define thread_safe_increment(V,L) \
|
|
pthread_mutex_lock((L)); (V)++; pthread_mutex_unlock((L));
|
|
#define thread_safe_add(V,C,L) \
|
|
pthread_mutex_lock((L)); (V)+=(C); pthread_mutex_unlock((L));
|
|
#define thread_safe_sub(V,C,L) \
|
|
pthread_mutex_lock((L)); (V)-=(C); pthread_mutex_unlock((L));
|
|
#ifdef SAFE_STATISTICS
|
|
#define statistic_increment(V,L) thread_safe_increment((V),(L))
|
|
#define statistic_add(V,C,L) thread_safe_add((V),(C),(L))
|
|
#else
|
|
#define statistic_increment(V,L) (V)++
|
|
#define statistic_add(V,C,L) (V)+=(C)
|
|
#endif /* SAFE_STATISTICS */
|
|
#endif /* HAVE_ATOMIC_ADD */
|
|
#endif /* thread_safe_increment */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif /* _my_ptread_h */
|