mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
144 lines
4 KiB
C
144 lines
4 KiB
C
/* Copyright (C) Yuri Dario & 2000 MySQL AB
|
|
All the above parties has a full, independent copyright to
|
|
the following code, including the right to use the code in
|
|
any manner without any demands from the other parties.
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
DWORD TlsAlloc( void);
|
|
BOOL TlsFree( DWORD);
|
|
PVOID TlsGetValue( DWORD);
|
|
BOOL TlsSetValue( DWORD, PVOID);
|
|
|
|
#define TLS_MINIMUM_AVAILABLE 64
|
|
|
|
|
|
PULONG tls_storage; /* TLS local storage */
|
|
DWORD tls_bits[2]; /* TLS in-use bits */
|
|
pthread_mutex_t tls_mutex; /* TLS mutex for in-use bits */
|
|
|
|
DWORD TlsAlloc( void)
|
|
{
|
|
DWORD index = -1;
|
|
DWORD mask, tibidx;
|
|
int i;
|
|
|
|
if (tls_storage == NULL) {
|
|
|
|
APIRET rc;
|
|
|
|
// allocate memory for TLS storage
|
|
rc = DosAllocThreadLocalMemory( 1, &tls_storage);
|
|
if (rc) {
|
|
fprintf( stderr, "DosAllocThreadLocalMemory error: return code = %u\n", rc);
|
|
}
|
|
|
|
// create a mutex
|
|
if (pthread_mutex_init( &tls_mutex, NULL))
|
|
fprintf( stderr, "Failed to init TLS mutex\n");
|
|
}
|
|
|
|
pthread_mutex_lock( &tls_mutex);
|
|
|
|
tibidx = 0;
|
|
if (tls_bits[0] == 0xFFFFFFFF) {
|
|
if (tls_bits[1] == 0xFFFFFFFF) {
|
|
fprintf( stderr, "tid#%d, no more TLS bits available\n", _threadid);
|
|
pthread_mutex_unlock( &tls_mutex);
|
|
return -1;
|
|
}
|
|
tibidx = 1;
|
|
}
|
|
for( i=0; i<32; i++) {
|
|
mask = (1 << i);
|
|
if ((tls_bits[ tibidx] & mask) == 0) {
|
|
tls_bits[ tibidx] |= mask;
|
|
index = (tibidx*32) + i;
|
|
break;
|
|
}
|
|
}
|
|
tls_storage[index] = 0;
|
|
|
|
pthread_mutex_unlock( &tls_mutex);
|
|
|
|
//fprintf( stderr, "tid#%d, TlsAlloc index %d\n", _threadid, index);
|
|
|
|
return index;
|
|
}
|
|
|
|
BOOL TlsFree( DWORD index)
|
|
{
|
|
int tlsidx;
|
|
DWORD mask;
|
|
|
|
if (index >= TLS_MINIMUM_AVAILABLE)
|
|
return NULL;
|
|
|
|
pthread_mutex_lock( &tls_mutex);
|
|
|
|
tlsidx = 0;
|
|
if (index > 32) {
|
|
tlsidx++;
|
|
}
|
|
mask = (1 << index);
|
|
if (tls_bits[ tlsidx] & mask) {
|
|
tls_bits[tlsidx] &= ~mask;
|
|
tls_storage[index] = 0;
|
|
pthread_mutex_unlock( &tls_mutex);
|
|
return TRUE;
|
|
}
|
|
|
|
pthread_mutex_unlock( &tls_mutex);
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
PVOID TlsGetValue( DWORD index)
|
|
{
|
|
if (index >= TLS_MINIMUM_AVAILABLE)
|
|
return NULL;
|
|
|
|
// verify if memory has been allocated for this thread
|
|
if (*tls_storage == NULL) {
|
|
// allocate memory for indexes
|
|
*tls_storage = (ULONG)calloc( TLS_MINIMUM_AVAILABLE, sizeof(int));
|
|
//fprintf( stderr, "tid#%d, tls_storage %x\n", _threadid, *tls_storage);
|
|
}
|
|
|
|
ULONG* tls_array = (ULONG*) *tls_storage;
|
|
return (PVOID) tls_array[ index];
|
|
}
|
|
|
|
BOOL TlsSetValue( DWORD index, PVOID val)
|
|
{
|
|
|
|
// verify if memory has been allocated for this thread
|
|
if (*tls_storage == NULL) {
|
|
// allocate memory for indexes
|
|
*tls_storage = (ULONG)calloc( TLS_MINIMUM_AVAILABLE, sizeof(int));
|
|
//fprintf( stderr, "tid#%d, tls_storage %x\n", _threadid, *tls_storage);
|
|
}
|
|
|
|
if (index >= TLS_MINIMUM_AVAILABLE)
|
|
return FALSE;
|
|
|
|
ULONG* tls_array = (ULONG*) *tls_storage;
|
|
//fprintf( stderr, "tid#%d, TlsSetValue array %08x index %d -> %08x (old)\n", _threadid, tls_array, index, tls_array[ index]);
|
|
tls_array[ index] = (ULONG) val;
|
|
//fprintf( stderr, "tid#%d, TlsSetValue array %08x index %d -> %08x\n", _threadid, tls_array, index, val);
|
|
|
|
return TRUE;
|
|
}
|