mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +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
302 lines
6.7 KiB
C
302 lines
6.7 KiB
C
/******************************************************
|
|
The interface to the operating system
|
|
process and thread control primitives
|
|
|
|
(c) 1995 Innobase Oy
|
|
|
|
Created 9/8/1995 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#include "os0thread.h"
|
|
#ifdef UNIV_NONINL
|
|
#include "os0thread.ic"
|
|
#endif
|
|
|
|
#ifdef __WIN__
|
|
#include <windows.h>
|
|
#endif
|
|
|
|
#include "srv0srv.h"
|
|
|
|
/*******************************************************************
|
|
Compares two thread ids for equality. */
|
|
|
|
ibool
|
|
os_thread_eq(
|
|
/*=========*/
|
|
/* out: TRUE if equal */
|
|
os_thread_id_t a, /* in: OS thread or thread id */
|
|
os_thread_id_t b) /* in: OS thread or thread id */
|
|
{
|
|
#ifdef __WIN__
|
|
if (a == b) {
|
|
return(TRUE);
|
|
}
|
|
|
|
return(FALSE);
|
|
#else
|
|
if (pthread_equal(a, b)) {
|
|
return(TRUE);
|
|
}
|
|
|
|
return(FALSE);
|
|
#endif
|
|
}
|
|
|
|
/********************************************************************
|
|
Converts an OS thread id to a ulint. It is NOT guaranteed that the ulint is
|
|
unique for the thread though! */
|
|
|
|
ulint
|
|
os_thread_pf(
|
|
/*=========*/
|
|
os_thread_id_t a)
|
|
{
|
|
#ifdef UNIV_HPUX10
|
|
/* In HP-UX-10.20 a pthread_t is a struct of 3 fields: field1, field2,
|
|
field3. We do not know if field1 determines the thread uniquely. */
|
|
|
|
return((ulint)(a.field1));
|
|
#else
|
|
return((ulint)a);
|
|
#endif
|
|
}
|
|
|
|
/*********************************************************************
|
|
Returns the thread identifier of current thread. Currently the thread
|
|
identifier in Unix is the thread handle itself. Note that in HP-UX
|
|
pthread_t is a struct of 3 fields. */
|
|
|
|
os_thread_id_t
|
|
os_thread_get_curr_id(void)
|
|
/*=======================*/
|
|
{
|
|
#ifdef __WIN__
|
|
return(GetCurrentThreadId());
|
|
#else
|
|
return(pthread_self());
|
|
#endif
|
|
}
|
|
|
|
/********************************************************************
|
|
Creates a new thread of execution. The execution starts from
|
|
the function given. The start function takes a void* parameter
|
|
and returns an ulint. */
|
|
|
|
os_thread_t
|
|
os_thread_create(
|
|
/*=============*/
|
|
/* out: handle to the thread */
|
|
#ifndef __WIN__
|
|
os_posix_f_t start_f,
|
|
#else
|
|
ulint (*start_f)(void*), /* in: pointer to function
|
|
from which to start */
|
|
#endif
|
|
void* arg, /* in: argument to start
|
|
function */
|
|
os_thread_id_t* thread_id) /* out: id of the created
|
|
thread */
|
|
{
|
|
#ifdef __WIN__
|
|
os_thread_t thread;
|
|
ulint win_thread_id;
|
|
|
|
thread = CreateThread(NULL, /* no security attributes */
|
|
0, /* default size stack */
|
|
(LPTHREAD_START_ROUTINE)start_f,
|
|
arg,
|
|
0, /* thread runs immediately */
|
|
&win_thread_id);
|
|
|
|
if (srv_set_thread_priorities) {
|
|
|
|
/* Set created thread priority the same as a normal query
|
|
in MYSQL: we try to prevent starvation of threads by
|
|
assigning same priority QUERY_PRIOR to all */
|
|
|
|
ut_a(SetThreadPriority(thread, srv_query_thread_priority));
|
|
}
|
|
|
|
*thread_id = win_thread_id;
|
|
|
|
return(thread);
|
|
#else
|
|
int ret;
|
|
os_thread_t pthread;
|
|
pthread_attr_t attr;
|
|
|
|
#if !(defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10))
|
|
pthread_attr_init(&attr);
|
|
#endif
|
|
|
|
#ifdef UNIV_AIX
|
|
/* We must make sure a thread stack is at least 32 kB, otherwise
|
|
InnoDB might crash; we do not know if the default stack size on
|
|
AIX is always big enough. An empirical test on AIX-4.3 suggested
|
|
the size was 96 kB, though. */
|
|
|
|
ret = pthread_attr_setstacksize(&attr,
|
|
(size_t)(PTHREAD_STACK_MIN + 32 * 1024));
|
|
if (ret) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);
|
|
exit(1);
|
|
}
|
|
#endif
|
|
|
|
#if defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10)
|
|
ret = pthread_create(&pthread, pthread_attr_default, start_f, arg);
|
|
#else
|
|
ret = pthread_create(&pthread, &attr, start_f, arg);
|
|
#endif
|
|
if (ret) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: pthread_create returned %d\n", ret);
|
|
exit(1);
|
|
}
|
|
|
|
#if !(defined(UNIV_HOTBACKUP) && defined(UNIV_HPUX10))
|
|
pthread_attr_destroy(&attr);
|
|
#endif
|
|
if (srv_set_thread_priorities) {
|
|
|
|
my_pthread_setprio(pthread, srv_query_thread_priority);
|
|
}
|
|
|
|
*thread_id = pthread;
|
|
|
|
return(pthread);
|
|
#endif
|
|
}
|
|
|
|
/*********************************************************************
|
|
Returns handle to the current thread. */
|
|
|
|
os_thread_t
|
|
os_thread_get_curr(void)
|
|
/*====================*/
|
|
{
|
|
#ifdef __WIN__
|
|
return(GetCurrentThread());
|
|
#else
|
|
return(pthread_self());
|
|
#endif
|
|
}
|
|
|
|
/*********************************************************************
|
|
Advises the os to give up remainder of the thread's time slice. */
|
|
|
|
void
|
|
os_thread_yield(void)
|
|
/*=================*/
|
|
{
|
|
#if defined(__WIN__)
|
|
Sleep(0);
|
|
#elif (defined(HAVE_SCHED_YIELD) && defined(HAVE_SCHED_H))
|
|
sched_yield();
|
|
#elif defined(HAVE_PTHREAD_YIELD_ZERO_ARG)
|
|
pthread_yield();
|
|
#elif defined(HAVE_PTHREAD_YIELD_ONE_ARG)
|
|
pthread_yield(0);
|
|
#else
|
|
os_thread_sleep(0);
|
|
#endif
|
|
}
|
|
|
|
/*********************************************************************
|
|
The thread sleeps at least the time given in microseconds. */
|
|
|
|
void
|
|
os_thread_sleep(
|
|
/*============*/
|
|
ulint tm) /* in: time in microseconds */
|
|
{
|
|
#ifdef __WIN__
|
|
Sleep(tm / 1000);
|
|
#elif defined(__NETWARE__)
|
|
delay(tm / 1000);
|
|
#else
|
|
struct timeval t;
|
|
|
|
t.tv_sec = tm / 1000000;
|
|
t.tv_usec = tm % 1000000;
|
|
|
|
select(0, NULL, NULL, NULL, &t);
|
|
#endif
|
|
}
|
|
|
|
/**********************************************************************
|
|
Sets a thread priority. */
|
|
|
|
void
|
|
os_thread_set_priority(
|
|
/*===================*/
|
|
os_thread_t handle, /* in: OS handle to the thread */
|
|
ulint pri) /* in: priority */
|
|
{
|
|
#ifdef __WIN__
|
|
int os_pri;
|
|
|
|
if (pri == OS_THREAD_PRIORITY_BACKGROUND) {
|
|
os_pri = THREAD_PRIORITY_BELOW_NORMAL;
|
|
} else if (pri == OS_THREAD_PRIORITY_NORMAL) {
|
|
os_pri = THREAD_PRIORITY_NORMAL;
|
|
} else if (pri == OS_THREAD_PRIORITY_ABOVE_NORMAL) {
|
|
os_pri = THREAD_PRIORITY_HIGHEST;
|
|
} else {
|
|
ut_error;
|
|
}
|
|
|
|
ut_a(SetThreadPriority(handle, os_pri));
|
|
#else
|
|
UT_NOT_USED(handle);
|
|
UT_NOT_USED(pri);
|
|
#endif
|
|
}
|
|
|
|
/**********************************************************************
|
|
Gets a thread priority. */
|
|
|
|
ulint
|
|
os_thread_get_priority(
|
|
/*===================*/
|
|
/* out: priority */
|
|
os_thread_t handle __attribute__((unused)))
|
|
/* in: OS handle to the thread */
|
|
{
|
|
#ifdef __WIN__
|
|
int os_pri;
|
|
ulint pri;
|
|
|
|
os_pri = GetThreadPriority(handle);
|
|
|
|
if (os_pri == THREAD_PRIORITY_BELOW_NORMAL) {
|
|
pri = OS_THREAD_PRIORITY_BACKGROUND;
|
|
} else if (os_pri == THREAD_PRIORITY_NORMAL) {
|
|
pri = OS_THREAD_PRIORITY_NORMAL;
|
|
} else if (os_pri == THREAD_PRIORITY_HIGHEST) {
|
|
pri = OS_THREAD_PRIORITY_ABOVE_NORMAL;
|
|
} else {
|
|
ut_error;
|
|
}
|
|
|
|
return(pri);
|
|
#else
|
|
return(0);
|
|
#endif
|
|
}
|
|
|
|
/**********************************************************************
|
|
Gets the last operating system error code for the calling thread. */
|
|
|
|
ulint
|
|
os_thread_get_last_error(void)
|
|
/*==========================*/
|
|
{
|
|
#ifdef __WIN__
|
|
return(GetLastError());
|
|
#else
|
|
return(0);
|
|
#endif
|
|
}
|