mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
f0ae3ce9b9
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
112 lines
2.8 KiB
C
112 lines
2.8 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; 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 */
|
|
|
|
/* Prototypes when using thr_alarm library functions */
|
|
|
|
#ifndef _thr_alarm_h
|
|
#define _thr_alarm_h
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef USE_ALARM_THREAD
|
|
#define USE_ONE_SIGNAL_HAND /* One must call process_alarm */
|
|
#endif
|
|
#ifdef HAVE_LINUXTHREADS
|
|
#define THR_CLIENT_ALARM SIGALRM
|
|
#else
|
|
#define THR_CLIENT_ALARM SIGUSR1
|
|
#endif
|
|
#ifdef HAVE_rts_threads
|
|
#undef USE_ONE_SIGNAL_HAND
|
|
#define USE_ALARM_THREAD
|
|
#define THR_SERVER_ALARM SIGUSR1
|
|
#else
|
|
#define THR_SERVER_ALARM SIGALRM
|
|
#endif
|
|
|
|
typedef struct st_alarm_info
|
|
{
|
|
ulong next_alarm_time;
|
|
uint active_alarms;
|
|
uint max_used_alarms;
|
|
} ALARM_INFO;
|
|
|
|
void thr_alarm_info(ALARM_INFO *info);
|
|
|
|
#if defined(DONT_USE_THR_ALARM) || !defined(THREAD)
|
|
|
|
#define USE_ALARM_THREAD
|
|
#undef USE_ONE_SIGNAL_HAND
|
|
|
|
typedef my_bool thr_alarm_t;
|
|
typedef my_bool ALARM;
|
|
|
|
#define thr_alarm_init(A) (*(A))=0
|
|
#define thr_alarm_in_use(A) (*(A) != 0)
|
|
#define thr_end_alarm(A)
|
|
#define thr_alarm(A,B,C) ((*(A)=1)-1)
|
|
/* The following should maybe be (*(A)) */
|
|
#define thr_got_alarm(A) 0
|
|
#define init_thr_alarm(A)
|
|
#define thr_alarm_kill(A)
|
|
#define resize_thr_alarm(N)
|
|
#define end_thr_alarm(A)
|
|
|
|
#else
|
|
#if defined(__WIN__)
|
|
typedef struct st_thr_alarm_entry
|
|
{
|
|
rf_SetTimer crono;
|
|
} thr_alarm_entry;
|
|
|
|
#else /* System with posix threads */
|
|
|
|
typedef int thr_alarm_entry;
|
|
|
|
#define thr_got_alarm(thr_alarm) (**(thr_alarm))
|
|
|
|
#endif /* __WIN__ */
|
|
|
|
typedef thr_alarm_entry* thr_alarm_t;
|
|
|
|
typedef struct st_alarm {
|
|
ulong expire_time;
|
|
thr_alarm_entry alarmed; /* set when alarm is due */
|
|
pthread_t thread;
|
|
my_thread_id thread_id;
|
|
my_bool malloced;
|
|
} ALARM;
|
|
|
|
#define thr_alarm_init(A) (*(A))=0
|
|
#define thr_alarm_in_use(A) (*(A)!= 0)
|
|
void init_thr_alarm(uint max_alarm);
|
|
void resize_thr_alarm(uint max_alarms);
|
|
my_bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff);
|
|
void thr_alarm_kill(my_thread_id thread_id);
|
|
void thr_end_alarm(thr_alarm_t *alarmed);
|
|
void end_thr_alarm(my_bool free_structures);
|
|
sig_handler process_alarm(int);
|
|
#ifndef thr_got_alarm
|
|
bool thr_got_alarm(thr_alarm_t *alrm);
|
|
#endif
|
|
|
|
|
|
#endif /* DONT_USE_THR_ALARM */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
#endif /* _thr_alarm_h */
|