mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
835a75c97b
Added statistics information for alarms (for bug tracking) Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me) Enlarged STACK_BUF_ALLOC becasue of failed crash-me test Aded new script mysql_tableinfo to make a system directory. Docs/manual.texi: Changelog and TODO include/mysql.h: Removed mysql_ssl_clear() (One should use mysql_close() instead) include/thr_alarm.h: Added info for alarms libmysql/libmysql.c: Made mysql_ssl_clear() static libmysql/libmysql.def: cleanup libmysqld/libmysqld.def: cleanup myisam/myisamchk.c: describe -> description myisam/myisampack.c: Fixed copyright. mysys/thr_alarm.c: Added statistics information for alarms (for bug tracking) scripts/Makefile.am: Added mysql_table_info sql-bench/crash-me.sh: Don't store "incomplete" in the xxx.cfg file if we are not using --restart. This was done becasue "incomplete" made it harder to quickly repeat a test that failed. sql-bench/limits/mysql.cfg: Update to 1.58 sql/hostname.cc: Remved compiler warning sql/item_func.cc: cleanup sql/item_func.h: Cleanup sql/mysql_priv.h: Enlarged STACK_BUF_ALLOC becasue of failed crash-me test sql/opt_range.cc: Removed purify warning sql/sql_parse.cc: cleanup sql/sql_test.cc: Added ala
118 lines
2.8 KiB
C
118 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; 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 */
|
|
|
|
/* 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 end_thr_alarm()
|
|
|
|
#else
|
|
#if defined(__WIN__)
|
|
typedef struct st_thr_alarm_entry
|
|
{
|
|
rf_SetTimer crono;
|
|
} thr_alarm_entry;
|
|
|
|
#elif defined(__EMX__) || defined(OS2)
|
|
|
|
typedef struct st_thr_alarm_entry
|
|
{
|
|
uint crono;
|
|
uint event;
|
|
} 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_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);
|
|
bool thr_alarm(thr_alarm_t *alarmed, uint sec, ALARM *buff);
|
|
void thr_alarm_kill(pthread_t thread_id);
|
|
void thr_end_alarm(thr_alarm_t *alarmed);
|
|
void end_thr_alarm(void);
|
|
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 */
|