mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
1d7de700e2
Fixed BUG#19542 "InnoDB doesn't increase the Handler_read_prev couter". Fixed BUG#19609 "Case sensitivity of innodb_data_file_path gives stupid error". Fixed BUG#19727 "InnoDB crashed server and crashed tables are ot recoverable". Also: * Remove remnants of the obsolete concept of memoryfixing tables and indexes. * Remove unused dict_table_LRU_trim(). * Remove unused 'trx' parameter from dict_table_get_on_id_low(), dict_table_get(), dict_table_get_and_increment_handle_count(). * Add a normal linked list implementation. * Add a work queue implementation. * Add 'level' parameter to mutex_create() and rw_lock_create(). Remove mutex_set_level() and rw_lock_set_level(). * Rename SYNC_LEVEL_NONE to SYNC_LEVEL_VARYING. * Add support for bound ids in InnoDB's parser. * Define UNIV_BTR_DEBUG for enabling consistency checks of FIL_PAGE_NEXT and FIL_PAGE_PREV when accessing sibling pages of B-tree indexes. btr_validate_level(): Check the validity of the doubly linked list formed by FIL_PAGE_NEXT and FIL_PAGE_PREV. * Adapt InnoDB to the new tablename to filename encoding in MySQL 5.1. ut_print_name(), ut_print_name1(): Add parameter 'table_id' for distinguishing names of tables from other identifiers. New: innobase_convert_from_table_id(), innobase_convert_from_id(), innobase_convert_from_filename(), innobase_get_charset. dict_accept(), dict_scan_id(), dict_scan_col(), dict_scan_table_name(), dict_skip_word(), dict_create_foreign_constraints_low(): Add parameter 'cs' so that isspace() can be replaced with my_isspace(), whose operation depends on the connection character set. dict_scan_id(): Convert identifier to UTF-8. dict_str_starts_with_keyword(): New extern function, to replace dict_accept() in row_search_for_mysql(). mysql_get_identifier_quote_char(): Replaced with innobase_print_identifier(). ha_innobase::create(): Remove the thd->convert_strin() call. Pass the statement to InnoDB in the connection character set and let InnoDB convert the identifier to UTF-8. * Add max_row_size to dict_table_t. * btr0cur.c btr_copy_externally_stored_field(): Only set the 'offset' variable when needed. * buf0buf.c buf_page_io_complete(): Write to the error log if the page number or the space id o the disk do not match those in memory. Also write to the error log if a page was read from the doublewrite buffer. The doublewrite buffer should be only read by the lower-level function fil_io() at database startup. * dict0dict.c dict_scan_table_name(): Remove fallback to differently encoded name when the table is not found. The encoding is handled at a higher level. * ha_innodb.cc Increment statistic counter in ha_innobase::index_prev() (bug 19542). Add innobase_convert_string wrapper function and a new file ha_prototypes.h. innobase_print_identifier(): Remove TODO comment before calling get_quote_char_for_identifier(). That function apparently assumes the identifier to be encoded in UTF-8. * ibuf0ibuf.c|h ibuf_count_get(), ibuf_counts[], ibuf_count_inited(): Define these only #ifdef UNIV_IBUF_DEBUG. Previously, when compiled without UNIV_IBUF_DEBUG, invoking ibuf_count_get() would crash InnoDB. The function is only being called #ifdef UNIV_IBUF_DEBUG. * innodb.result Adjust the results for changes in the foreign key error messages. * mem0mem.c|h New: mem_heap_dup(), mem_heap_printf(), mem_heap_cat(). * os0file.c Check the page trailers also after writing to disk. This improves chances of diagnosing bug 18886. os_file_check_page_trailers(): New function for checking that the two copies of the LSN stamped on the page match. os_aio_simulated_handle(): Call os_file_check_page_trailers() before and after os_file_write(). * row0mysql.c Move trx_commit_for_mysql(trx) calls before calls to row_mysql_unlock_data_dictionary(trx) (bug 19727). * row0sel.c row_fetch_print(): Handle SQL NULL values without crashing. row_sel_store_mysql_rec(): Remove useless call to rec_get_nth_field when handling an externally stored column. Fetch externally stored fields when using InnoDB's internal SQL parser. Optimize BLOB selects by using prebuilt->blob_heap directly instead of first reading BLOB data to a temporary heap and then copying it to prebuilt->blob_heap. * srv0srv.c srv_master_thread(): Remove unreachable code. * srv0start.c srv_parse_data_file_paths_and_sizes(): Accept lower-case 'm' and 'g' as abbreviations of megabyte and gigabyte (bug 19609). srv_parse_megabytes(): New fuction. * ut0dbg.c|h Implement InnoDB assertions (ut_a and ut_error) with abort() when the code is compiled with GCC 3 or later on other platforms than Windows or Netware. Also disable the variable ut_dbg_stop_threads and the function ut_dbg_stop_thread() i this case, unless UNIV_SYC_DEBUG is defined. This should allow the compiler to generate more compact code for assertions. * ut0list.c|h Add ib_list_create_heap().
355 lines
7.7 KiB
C
355 lines
7.7 KiB
C
/******************************************************
|
|
The interface to the operating system 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"
|
|
#include "os0sync.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, or NULL */
|
|
{
|
|
#ifdef __WIN__
|
|
os_thread_t thread;
|
|
DWORD win_thread_id;
|
|
|
|
os_mutex_enter(os_sync_mutex);
|
|
os_thread_count++;
|
|
os_mutex_exit(os_sync_mutex);
|
|
|
|
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));
|
|
}
|
|
|
|
if (thread_id) {
|
|
*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
|
|
#ifdef __NETWARE__
|
|
ret = pthread_attr_setstacksize(&attr,
|
|
(size_t) NW_THD_STACKSIZE);
|
|
if (ret) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: pthread_attr_setstacksize returned %d\n", ret);
|
|
exit(1);
|
|
}
|
|
#endif
|
|
os_mutex_enter(os_sync_mutex);
|
|
os_thread_count++;
|
|
os_mutex_exit(os_sync_mutex);
|
|
|
|
#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);
|
|
}
|
|
|
|
if (thread_id) {
|
|
*thread_id = pthread;
|
|
}
|
|
|
|
return(pthread);
|
|
#endif
|
|
}
|
|
|
|
/*********************************************************************
|
|
Exits the current thread. */
|
|
|
|
void
|
|
os_thread_exit(
|
|
/*===========*/
|
|
void* exit_value) /* in: exit value; in Windows this void*
|
|
is cast as a DWORD */
|
|
{
|
|
#ifdef UNIV_DEBUG_THREAD_CREATION
|
|
fprintf(stderr, "Thread exits, id %lu\n",
|
|
os_thread_pf(os_thread_get_curr_id()));
|
|
#endif
|
|
os_mutex_enter(os_sync_mutex);
|
|
os_thread_count--;
|
|
os_mutex_exit(os_sync_mutex);
|
|
|
|
#ifdef __WIN__
|
|
ExitThread((DWORD)exit_value);
|
|
#else
|
|
pthread_exit(exit_value);
|
|
#endif
|
|
}
|
|
|
|
#ifdef HAVE_PTHREAD_JOIN
|
|
int
|
|
os_thread_join(
|
|
/*===========*/
|
|
os_thread_id_t thread_id) /* in: id of the thread to join */
|
|
{
|
|
return(pthread_join(thread_id, NULL));
|
|
}
|
|
#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((DWORD) 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
|
|
}
|