mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
9e6784924a
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 BitKeeper/deleted/.del-SETUP.sh.rej: Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej BitKeeper/deleted/.del-configure.in.rej: Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej BitKeeper/deleted/.del-my_global.h.rej: Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej BitKeeper/deleted/.del-my_pthread.h.rej: Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej BitKeeper/deleted/.del-mysql_client_test.c.rej: Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89: Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89 BitKeeper/deleted/.del-sql_parse.cc.rej: Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej BitKeeper/deleted/.del-table.cc.rej: Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej BitKeeper/deleted/.del-thr_alarm.c.rej: Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej BUILD/compile-pentium64: Update this to be in line with compile-pentium BUILD/compile-pentium: Send command line options to SETUP.sh BUILD/compile-solaris-sparc-debug: Update scripts BUILD/compile-solaris-sparc-forte: Update scripts BUILD/compile-solaris-sparc-purify: Update scripts BUILD/compile-solaris-sparc: Update scripts BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Removed compiler warning BitKeeper/deleted/.del-ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 configure.in: Added detection of port_create and port.h (for future)as --- manual merge BitKeeper/deleted/.del-ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Fixed compiler warnings BitKeeper/etc/ignore: added storage/ndb/src/ndbapi/ndberror_check client/mysqlbinlog.cc: Removed not needed 'static' (caused compiler warning) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Free warning and query memory no abort. (Removes strange warnings on screen if mysql-test-run fails) Removed compiler warnings Portability fix for windows (windows doesn't have mode_t) client/sql_string.h: Removed compiler warning cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/charset2html.c: Fixed compiler warnings extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/lock.hpp: Fix for windows64 extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/include/yassl.hpp: Fix for windows64 extra/yassl/src/ssl.cpp: Removed compiler warning Detect wrong parameter (Happens when running test suite on solaris) Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Removed compiler warning include/config-win.h: Added HAVE_WINSOCK2 (for future) include/my_dbug.h: Fixed DBUG_PROCESS() so that we don't get compiler warnings for it include/my_global.h: Fixed unsafe define of uint4korr() manual merge (ignore changes from 5.0) Fixed warnings on win64 when using int5store and int6store include/my_pthread.h: Added my_thread_id typedef Renamed 'my_thread_id() function to my_thead_dbug_id() include/thr_alarm.h: Make thr_alarm_kill() to depend on thread_id instead of thread include/thr_lock.h: Make thr_abort_locks_for_thread() depend on thread_id instead of thread libmysql/libmysql.def: Fixed compiler warnings on win64 libmysqld/CMakeLists.txt: Added missing files libmysqld/Makefile.am: Added new files libmysqld/lib_sql.cc: Remove not needed code (store_globals() now takes care of things) mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) Fixed typo that caused mysql-test-run.pl to fail on Solaris mysql-test/r/keywords.result: manual merge mysql-test/r/ndb_lock.result: After merge fixes mysql-test/r/ps.result: Portability fix mysql-test/t/disabled.def: Disabled ndb_alter_table as this very often fails for me (and have done it for a long time) mysql-test/t/keywords.test: manual merge mysql-test/t/ndb_lock.test: Added other possible error code mysql-test/t/ps.test: Portability fix (when compiling without DLOPEN) mysql-test/t/wait_timeout.test: Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts) mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings mysys/my_getopt.c: Fixed compiler warning mysys/my_init.c: Fixed compiler warning Re-indented long comment mysys/my_thr_init.c: Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage) Always generate my_thread_name() when using DBUG Ensure mysys_var->pthread_self is set Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build mysys/thr_alarm.c: Change thr_alarm_kill() to use mysys_var->id instead of thread id Fixed compiler warning on windows mysys/thr_lock.c: Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id Add purecov statements around not tested code Fixed compiler warnings mysys/thr_mutex.c: my_thread_id() -> my_thread_dbug_id() server-tools/instance-manager/guardian.cc: Fixed compiler warning server-tools/instance-manager/instance.cc: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/CMakeLists.txt: Added missing files sql/Makefile.am: Added new files sql/event_scheduler.cc: Added pthread_exit() calls Ensure DBUG_xxx calls are not made before my_thread_init() Use common functions to set up thread handling sql/field.h: manual merge sql/ha_ndbcluster.cc: Removed some trivial 'current_thd' calls sql/handler.cc: Avoid warnings on KILL_CONNECTION Don't print out null pointer with printf() (Causes crashes on Solaris) sql/item.cc: Fixed compiler warnings from 'max' build sql/item_cmpfunc.cc: After merge fixes sql/item_func.cc: Merge embedded and normal code usage (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t) Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warnings sql/lock.cc: Use (new) parameter to thr_abort_locks_for_thread() sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warnings about not used variable sql/mysql_priv.h: Remove TEST_NO_THREADS (not needed with new scheduler interface) Added functions from sql_connect.cc and new functions from sql_parse.cc sql/mysqld.cc: Use thread_scheduler structure to dispatch calls (make code more dynamic) Change --one-thread option to use thread_scheduler interface Made ONE_THREAD option independent of DBUG_BUILD --one-thread is now depricated. One should instead use '--thread-handling=no-threads' Remove not used uname() function. Split create_new_thread() into reusable sub functions. Preliminary interface code for future thread_handling code. Fixed compiler warnings sql/parse_file.cc: Don't send zero pointer to fn_format() (Causes crashes when using --debug) sql/repl_failsafe.cc: Setup pseudo_thread_id same way as other code sql/set_var.cc: Added variables 'thread_handling' Prepare for future variable 'thread_pool_size' Fixed compiler warnings sql/set_var.h: Fixed compiler warning sql/slave.cc: Setup pseudo_thread_id same way as other code Removed not used signal mask sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed long comments Normalized variable setup Don't destroy value of thd->variables.pseduo_thread_id More DBUG_PRINT()'s More DBUG_ASSERT()'s Fixed compiler warnings from 'max' build sql/sql_class.cc: Remove thd->real_id and thd->dbug_thread_id Added DBUG_ASSERT() Use thread_scheduler to signal threads to be killed. In THD::store_globals(), set my_thread_var->id to be thd->thread_id. Fixed compiler warnings sql/sql_class.h: Use 'my_thread_id' for internal thread id's Remove not needed THD elements: block_signals and dbug_thread_id Added 'thread_scheduler' scheduling extension element to THD sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) Setup pseudo_thread_id same way as other code Removed not used signal mask Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_parse.cc: Move connection related code to sql_connect.cc Remove setting of signal mask (not needed) Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug) Added previous 'optional' element to reset_mgh() Removed not needed DBUG_PRINT call sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Removed not needed casts Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql-bench/bench-init.pl.sh: Added --one-missing-tests sql-bench/example: Better example sql-bench/run-all-tests.sh: Added --only-missing-tests sql-bench/test-insert.sh: Fixed wrong estimate of update_with_key_prefix sql/sql_show.cc: Don't send pthread_kill() to threads to detect if they exists. (Not that useful and causes problems with future thread_handling code) Fixed compiler warnings sql/sql_table.cc: Simplify code Fixed compiler warnings sql/sql_test.cc: Remove dbug_thread_id from test output sql/sql_view.cc: Don't send zero pointer to fn_format() sql/tztime.cc: Fixed compiler warning sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions storage/archive/archive_test.c: Fixed compiler warnings storage/archive/azio.c: Fixed compiler warnings storage/innobase/dict/dict0crea.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0dict.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0load.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0mem.c: Fixed compiler warnings detected on windows64 storage/innobase/eval/eval0proc.c: Fixed compiler warnings detected on windows64 storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings detected on windows64 storage/innobase/include/ut0byte.ic: Fixed compiler warnings on win64 storage/innobase/include/ut0ut.ic: Fixed compiler warnings on win64 storage/innobase/mtr/mtr0log.c: Fixed compiler warnings detected on windows64 storage/innobase/pars/pars0lex.l: Fixed warnings on win64 storage/innobase/rem/rem0cmp.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0mysql.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0sel.c: Fixed compiler warnings detected on windows64 storage/innobase/sync/sync0rw.c: Fixed compiler warnings detected on windows64 storage/innobase/trx/trx0trx.c: Fixed compiler warnings detected on windows64 storage/myisam/mi_log.c: my_thread_id() -> my_thread_debug_id() storage/myisam/mi_packrec.c: Fixed compiler warnings detected on windows64 storage/myisam/myisamchk.c: Fixed compiler warnings from 'max' build storage/ndb/src/common/debugger/EventLogger.cpp: Fixed compiler warnings storage/ndb/src/common/util/ConfigValues.cpp: Removed compiler warnings storage/ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warnings storage/ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/diskpage.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/main.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/SignalSender.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_strchr.c: Fixed conflict between function and prototype support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build Suppress warnings from bdb and (for the moment) warnings from ndb Suppress all warnings for all pushbuild platforms (should make all trees green) vio/viosslfactories.c: Added DBUG_PRINT BUILD/compile-pentium64-max: New BitKeeper file ``BUILD/compile-pentium64-max'' libmysqld/scheduler.cc: New BitKeeper file ``libmysqld/scheduler.cc'' libmysqld/sql_connect.cc: New BitKeeper file ``libmysqld/sql_connect.cc'' mysql-test/include/one_thread_per_connection.inc: New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc'' mysql-test/r/no-threads.result: New BitKeeper file ``mysql-test/r/no-threads.result'' mysql-test/r/one_thread_per_connection.require: New BitKeeper file ``mysql-test/r/one_thread_per_connection.require'' mysql-test/t/no-threads-master.opt: New BitKeeper file ``mysql-test/t/no-threads-master.opt'' mysql-test/t/no-threads.test: New BitKeeper file ``mysql-test/t/no-threads.test'' sql/scheduler.cc: New BitKeeper file ``sql/scheduler.cc'' sql/scheduler.h: New BitKeeper file ``sql/scheduler.h'' sql/sql_connect.cc: New BitKeeper file ``sql/sql_connect.cc''
943 lines
24 KiB
C
943 lines
24 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 */
|
|
|
|
/* To avoid problems with alarms in debug code, we disable DBUG here */
|
|
#define FORCE_DBUG_OFF
|
|
#include <my_global.h>
|
|
|
|
#if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
|
|
#include <errno.h>
|
|
#include <my_pthread.h>
|
|
#include <signal.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
#include <queues.h>
|
|
#include "thr_alarm.h"
|
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h> /* AIX needs this for fd_set */
|
|
#endif
|
|
|
|
#ifndef ETIME
|
|
#define ETIME ETIMEDOUT
|
|
#endif
|
|
|
|
static int alarm_aborted=1; /* No alarm thread */
|
|
my_bool thr_alarm_inited= 0;
|
|
volatile my_bool alarm_thread_running= 0;
|
|
|
|
static sig_handler process_alarm_part2(int sig);
|
|
|
|
#if !defined(__WIN__)
|
|
|
|
static pthread_mutex_t LOCK_alarm;
|
|
static pthread_cond_t COND_alarm;
|
|
static sigset_t full_signal_set;
|
|
static QUEUE alarm_queue;
|
|
static uint max_used_alarms=0;
|
|
pthread_t alarm_thread;
|
|
|
|
#ifdef USE_ALARM_THREAD
|
|
static void *alarm_handler(void *arg);
|
|
#define reschedule_alarms() pthread_cond_signal(&COND_alarm)
|
|
#else
|
|
#define reschedule_alarms() pthread_kill(alarm_thread,THR_SERVER_ALARM)
|
|
#endif
|
|
|
|
#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
|
|
static sig_handler thread_alarm(int sig __attribute__((unused)));
|
|
#endif
|
|
|
|
static int compare_ulong(void *not_used __attribute__((unused)),
|
|
byte *a_ptr,byte* b_ptr)
|
|
{
|
|
ulong a=*((ulong*) a_ptr),b= *((ulong*) b_ptr);
|
|
return (a < b) ? -1 : (a == b) ? 0 : 1;
|
|
}
|
|
|
|
void init_thr_alarm(uint max_alarms)
|
|
{
|
|
sigset_t s;
|
|
DBUG_ENTER("init_thr_alarm");
|
|
alarm_aborted=0;
|
|
init_queue(&alarm_queue,max_alarms+1,offsetof(ALARM,expire_time),0,
|
|
compare_ulong,NullS);
|
|
sigfillset(&full_signal_set); /* Neaded to block signals */
|
|
pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
|
|
pthread_cond_init(&COND_alarm,NULL);
|
|
#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
|
|
my_sigset(THR_CLIENT_ALARM,thread_alarm);
|
|
#endif
|
|
sigemptyset(&s);
|
|
sigaddset(&s, THR_SERVER_ALARM);
|
|
alarm_thread=pthread_self();
|
|
#if defined(USE_ALARM_THREAD)
|
|
{
|
|
pthread_attr_t thr_attr;
|
|
pthread_attr_init(&thr_attr);
|
|
pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
|
|
pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
|
|
pthread_attr_setstacksize(&thr_attr,8196);
|
|
|
|
my_pthread_attr_setprio(&thr_attr,100); /* Very high priority */
|
|
VOID(pthread_create(&alarm_thread,&thr_attr,alarm_handler,NULL));
|
|
VOID(pthread_attr_destroy(&thr_attr));
|
|
}
|
|
#elif defined(USE_ONE_SIGNAL_HAND)
|
|
pthread_sigmask(SIG_BLOCK, &s, NULL); /* used with sigwait() */
|
|
#if THR_SERVER_ALARM == THR_CLIENT_ALARM
|
|
my_sigset(THR_CLIENT_ALARM,process_alarm); /* Linuxthreads */
|
|
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
|
#endif
|
|
#else
|
|
my_sigset(THR_SERVER_ALARM, process_alarm);
|
|
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
|
#endif
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void resize_thr_alarm(uint max_alarms)
|
|
{
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
/*
|
|
It's ok not to shrink the queue as there may be more pending alarms than
|
|
than max_alarms
|
|
*/
|
|
if (alarm_queue.elements < max_alarms)
|
|
resize_queue(&alarm_queue,max_alarms+1);
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
}
|
|
|
|
|
|
/*
|
|
Request alarm after sec seconds.
|
|
|
|
SYNOPSIS
|
|
thr_alarm()
|
|
alrm Pointer to alarm detection
|
|
alarm_data Structure to store in alarm queue
|
|
|
|
NOTES
|
|
This function can't be called from the alarm-handling thread.
|
|
|
|
RETURN VALUES
|
|
0 ok
|
|
1 If no more alarms are allowed (aborted by process)
|
|
|
|
Stores in first argument a pointer to a non-zero int which is set to 0
|
|
when the alarm has been given
|
|
*/
|
|
|
|
my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm_data)
|
|
{
|
|
ulong now;
|
|
sigset_t old_mask;
|
|
my_bool reschedule;
|
|
struct st_my_thread_var *current_my_thread_var= my_thread_var;
|
|
DBUG_ENTER("thr_alarm");
|
|
DBUG_PRINT("enter",("thread: %s sec: %d",my_thread_name(),sec));
|
|
|
|
now=(ulong) time((time_t*) 0);
|
|
pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask);
|
|
pthread_mutex_lock(&LOCK_alarm); /* Lock from threads & alarms */
|
|
if (alarm_aborted > 0)
|
|
{ /* No signal thread */
|
|
DBUG_PRINT("info", ("alarm aborted"));
|
|
*alrm= 0; /* No alarm */
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
|
DBUG_RETURN(1);
|
|
}
|
|
if (alarm_aborted < 0)
|
|
sec= 1; /* Abort mode */
|
|
|
|
if (alarm_queue.elements >= max_used_alarms)
|
|
{
|
|
if (alarm_queue.elements == alarm_queue.max_elements)
|
|
{
|
|
DBUG_PRINT("info", ("alarm queue full"));
|
|
fprintf(stderr,"Warning: thr_alarm queue is full\n");
|
|
*alrm= 0; /* No alarm */
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
|
DBUG_RETURN(1);
|
|
}
|
|
max_used_alarms=alarm_queue.elements+1;
|
|
}
|
|
reschedule= (!alarm_queue.elements ||
|
|
(int) (((ALARM*) queue_top(&alarm_queue))->expire_time - now) >
|
|
(int) sec);
|
|
if (!alarm_data)
|
|
{
|
|
if (!(alarm_data=(ALARM*) my_malloc(sizeof(ALARM),MYF(MY_WME))))
|
|
{
|
|
DBUG_PRINT("info", ("failed my_malloc()"));
|
|
*alrm= 0; /* No alarm */
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
|
DBUG_RETURN(1);
|
|
}
|
|
alarm_data->malloced=1;
|
|
}
|
|
else
|
|
alarm_data->malloced=0;
|
|
alarm_data->expire_time=now+sec;
|
|
alarm_data->alarmed=0;
|
|
alarm_data->thread= current_my_thread_var->pthread_self;
|
|
alarm_data->thread_id= current_my_thread_var->id;
|
|
queue_insert(&alarm_queue,(byte*) alarm_data);
|
|
|
|
/* Reschedule alarm if the current one has more than sec left */
|
|
if (reschedule)
|
|
{
|
|
DBUG_PRINT("info", ("reschedule"));
|
|
if (pthread_equal(pthread_self(),alarm_thread))
|
|
alarm(sec); /* purecov: inspected */
|
|
else
|
|
reschedule_alarms(); /* Reschedule alarms */
|
|
}
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
|
(*alrm)= &alarm_data->alarmed;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/*
|
|
Remove alarm from list of alarms
|
|
*/
|
|
|
|
void thr_end_alarm(thr_alarm_t *alarmed)
|
|
{
|
|
ALARM *alarm_data;
|
|
sigset_t old_mask;
|
|
uint i, found=0;
|
|
DBUG_ENTER("thr_end_alarm");
|
|
|
|
pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask);
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
|
|
alarm_data= (ALARM*) ((byte*) *alarmed - offsetof(ALARM,alarmed));
|
|
for (i=0 ; i < alarm_queue.elements ; i++)
|
|
{
|
|
if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data)
|
|
{
|
|
queue_remove(&alarm_queue,i),MYF(0);
|
|
if (alarm_data->malloced)
|
|
my_free((gptr) alarm_data,MYF(0));
|
|
found++;
|
|
#ifdef DBUG_OFF
|
|
break;
|
|
#endif
|
|
}
|
|
}
|
|
DBUG_ASSERT(!*alarmed || found == 1);
|
|
if (!found)
|
|
{
|
|
if (*alarmed)
|
|
fprintf(stderr,"Warning: Didn't find alarm 0x%lx in queue of %d alarms\n",
|
|
(long) *alarmed, alarm_queue.elements);
|
|
DBUG_PRINT("warning",("Didn't find alarm 0x%lx in queue\n",
|
|
(long) *alarmed));
|
|
}
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
Come here when some alarm in queue is due.
|
|
Mark all alarms with are finnished in list.
|
|
Shedule alarms to be sent again after 1-10 sec (many alarms at once)
|
|
If alarm_aborted is set then all alarms are given and resent
|
|
every second.
|
|
*/
|
|
|
|
sig_handler process_alarm(int sig __attribute__((unused)))
|
|
{
|
|
sigset_t old_mask;
|
|
/*
|
|
This must be first as we can't call DBUG inside an alarm for a normal thread
|
|
*/
|
|
|
|
#if THR_SERVER_ALARM == THR_CLIENT_ALARM
|
|
if (!pthread_equal(pthread_self(),alarm_thread))
|
|
{
|
|
#if defined(MAIN) && !defined(__bsdi__)
|
|
printf("thread_alarm in process_alarm\n"); fflush(stdout);
|
|
#endif
|
|
#ifdef DONT_REMEMBER_SIGNAL
|
|
my_sigset(THR_CLIENT_ALARM,process_alarm); /* int. thread system calls */
|
|
#endif
|
|
return;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
We have to do do the handling of the alarm in a sub function,
|
|
because otherwise we would get problems with two threads calling
|
|
DBUG_... functions at the same time (as two threads may call
|
|
process_alarm() at the same time
|
|
*/
|
|
|
|
#ifndef USE_ALARM_THREAD
|
|
pthread_sigmask(SIG_SETMASK,&full_signal_set,&old_mask);
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
#endif
|
|
process_alarm_part2(sig);
|
|
#ifndef USE_ALARM_THREAD
|
|
#if defined(DONT_REMEMBER_SIGNAL) && !defined(USE_ONE_SIGNAL_HAND)
|
|
my_sigset(THR_SERVER_ALARM,process_alarm);
|
|
#endif
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
|
#endif
|
|
return;
|
|
}
|
|
|
|
|
|
static sig_handler process_alarm_part2(int sig __attribute__((unused)))
|
|
{
|
|
ALARM *alarm_data;
|
|
DBUG_ENTER("process_alarm");
|
|
DBUG_PRINT("info",("sig: %d active alarms: %d",sig,alarm_queue.elements));
|
|
|
|
#if defined(MAIN) && !defined(__bsdi__)
|
|
printf("process_alarm\n"); fflush(stdout);
|
|
#endif
|
|
if (alarm_queue.elements)
|
|
{
|
|
if (alarm_aborted)
|
|
{
|
|
uint i;
|
|
for (i=0 ; i < alarm_queue.elements ;)
|
|
{
|
|
alarm_data=(ALARM*) queue_element(&alarm_queue,i);
|
|
alarm_data->alarmed=1; /* Info to thread */
|
|
if (pthread_equal(alarm_data->thread,alarm_thread) ||
|
|
pthread_kill(alarm_data->thread, THR_CLIENT_ALARM))
|
|
{
|
|
#ifdef MAIN
|
|
printf("Warning: pthread_kill couldn't find thread!!!\n");
|
|
#endif
|
|
queue_remove(&alarm_queue,i); /* No thread. Remove alarm */
|
|
}
|
|
else
|
|
i++; /* Signal next thread */
|
|
}
|
|
#ifndef USE_ALARM_THREAD
|
|
if (alarm_queue.elements)
|
|
alarm(1); /* Signal soon again */
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
ulong now=(ulong) time((time_t*) 0);
|
|
ulong next=now+10-(now%10);
|
|
while ((alarm_data=(ALARM*) queue_top(&alarm_queue))->expire_time <= now)
|
|
{
|
|
alarm_data->alarmed=1; /* Info to thread */
|
|
DBUG_PRINT("info",("sending signal to waiting thread"));
|
|
if (pthread_equal(alarm_data->thread,alarm_thread) ||
|
|
pthread_kill(alarm_data->thread, THR_CLIENT_ALARM))
|
|
{
|
|
#ifdef MAIN
|
|
printf("Warning: pthread_kill couldn't find thread!!!\n");
|
|
#endif
|
|
queue_remove(&alarm_queue,0); /* No thread. Remove alarm */
|
|
if (!alarm_queue.elements)
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
alarm_data->expire_time=next;
|
|
queue_replaced(&alarm_queue);
|
|
}
|
|
}
|
|
#ifndef USE_ALARM_THREAD
|
|
if (alarm_queue.elements)
|
|
{
|
|
#ifdef __bsdi__
|
|
alarm(0); /* Remove old alarm */
|
|
#endif
|
|
alarm((uint) (alarm_data->expire_time-now));
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Schedule all alarms now and optionally free all structures
|
|
|
|
SYNPOSIS
|
|
end_thr_alarm()
|
|
free_structures Set to 1 if we should free memory used for
|
|
the alarm queue.
|
|
When we call this we should KNOW that there
|
|
is no active alarms
|
|
IMPLEMENTATION
|
|
Set alarm_abort to -1 which will change the behavior of alarms as follows:
|
|
- All old alarms will be rescheduled at once
|
|
- All new alarms will be rescheduled to one second
|
|
*/
|
|
|
|
void end_thr_alarm(my_bool free_structures)
|
|
{
|
|
DBUG_ENTER("end_thr_alarm");
|
|
if (alarm_aborted != 1) /* If memory not freed */
|
|
{
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
DBUG_PRINT("info",("Resheduling %d waiting alarms",alarm_queue.elements));
|
|
alarm_aborted= -1; /* mark aborted */
|
|
if (alarm_queue.elements || (alarm_thread_running && free_structures))
|
|
{
|
|
if (pthread_equal(pthread_self(),alarm_thread))
|
|
alarm(1); /* Shut down everything soon */
|
|
else
|
|
reschedule_alarms();
|
|
}
|
|
if (free_structures)
|
|
{
|
|
struct timespec abstime;
|
|
|
|
DBUG_ASSERT(!alarm_queue.elements);
|
|
|
|
/* Wait until alarm thread dies */
|
|
set_timespec(abstime, 10); /* Wait up to 10 seconds */
|
|
while (alarm_thread_running)
|
|
{
|
|
int error= pthread_cond_timedwait(&COND_alarm, &LOCK_alarm, &abstime);
|
|
if (error == ETIME || error == ETIMEDOUT)
|
|
break; /* Don't wait forever */
|
|
}
|
|
delete_queue(&alarm_queue);
|
|
alarm_aborted= 1;
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
if (!alarm_thread_running) /* Safety */
|
|
{
|
|
pthread_mutex_destroy(&LOCK_alarm);
|
|
pthread_cond_destroy(&COND_alarm);
|
|
}
|
|
}
|
|
else
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Remove another thread from the alarm
|
|
*/
|
|
|
|
void thr_alarm_kill(my_thread_id thread_id)
|
|
{
|
|
uint i;
|
|
if (alarm_aborted)
|
|
return;
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
for (i=0 ; i < alarm_queue.elements ; i++)
|
|
{
|
|
if (((ALARM*) queue_element(&alarm_queue,i))->thread_id == thread_id)
|
|
{
|
|
ALARM *tmp=(ALARM*) queue_remove(&alarm_queue,i);
|
|
tmp->expire_time=0;
|
|
queue_insert(&alarm_queue,(byte*) tmp);
|
|
reschedule_alarms();
|
|
break;
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
}
|
|
|
|
|
|
void thr_alarm_info(ALARM_INFO *info)
|
|
{
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
info->next_alarm_time= 0;
|
|
info->max_used_alarms= max_used_alarms;
|
|
if ((info->active_alarms= alarm_queue.elements))
|
|
{
|
|
ulong now=(ulong) time((time_t*) 0);
|
|
long time_diff;
|
|
ALARM *alarm_data= (ALARM*) queue_top(&alarm_queue);
|
|
time_diff= (long) (alarm_data->expire_time - now);
|
|
info->next_alarm_time= (ulong) (time_diff < 0 ? 0 : time_diff);
|
|
}
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
}
|
|
|
|
/*
|
|
This is here for thread to get interruptet from read/write/fcntl
|
|
ARGSUSED
|
|
*/
|
|
|
|
#if THR_CLIENT_ALARM != SIGALRM || defined(USE_ALARM_THREAD)
|
|
static sig_handler thread_alarm(int sig)
|
|
{
|
|
#ifdef MAIN
|
|
printf("thread_alarm\n"); fflush(stdout);
|
|
#endif
|
|
#ifdef DONT_REMEMBER_SIGNAL
|
|
my_sigset(sig,thread_alarm); /* int. thread system calls */
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_TIMESPEC_TS_SEC
|
|
#define tv_sec ts_sec
|
|
#define tv_nsec ts_nsec
|
|
#endif
|
|
|
|
/* set up a alarm thread with uses 'sleep' to sleep between alarms */
|
|
|
|
#ifdef USE_ALARM_THREAD
|
|
static void *alarm_handler(void *arg __attribute__((unused)))
|
|
{
|
|
int error;
|
|
struct timespec abstime;
|
|
#ifdef MAIN
|
|
puts("Starting alarm thread");
|
|
#endif
|
|
my_thread_init();
|
|
alarm_thread_running= 1;
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
for (;;)
|
|
{
|
|
if (alarm_queue.elements)
|
|
{
|
|
ulong sleep_time,now=time((time_t*) 0);
|
|
if (alarm_aborted)
|
|
sleep_time=now+1;
|
|
else
|
|
sleep_time= ((ALARM*) queue_top(&alarm_queue))->expire_time;
|
|
if (sleep_time > now)
|
|
{
|
|
abstime.tv_sec=sleep_time;
|
|
abstime.tv_nsec=0;
|
|
if ((error=pthread_cond_timedwait(&COND_alarm,&LOCK_alarm,&abstime)) &&
|
|
error != ETIME && error != ETIMEDOUT)
|
|
{
|
|
#ifdef MAIN
|
|
printf("Got error: %d from ptread_cond_timedwait (errno: %d)\n",
|
|
error,errno);
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
else if (alarm_aborted == -1)
|
|
break;
|
|
else if ((error=pthread_cond_wait(&COND_alarm,&LOCK_alarm)))
|
|
{
|
|
#ifdef MAIN
|
|
printf("Got error: %d from ptread_cond_wait (errno: %d)\n",
|
|
error,errno);
|
|
#endif
|
|
}
|
|
process_alarm(0);
|
|
}
|
|
bzero((char*) &alarm_thread,sizeof(alarm_thread)); /* For easy debugging */
|
|
alarm_thread_running= 0;
|
|
pthread_cond_signal(&COND_alarm);
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
pthread_exit(0);
|
|
return 0; /* Impossible */
|
|
}
|
|
#endif /* USE_ALARM_THREAD */
|
|
|
|
/*****************************************************************************
|
|
thr_alarm for win95
|
|
*****************************************************************************/
|
|
|
|
#else /* __WIN__ */
|
|
|
|
void thr_alarm_kill(my_thread_id thread_id)
|
|
{
|
|
/* Can't do this yet */
|
|
}
|
|
|
|
sig_handler process_alarm(int sig __attribute__((unused)))
|
|
{
|
|
/* Can't do this yet */
|
|
}
|
|
|
|
|
|
my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm)
|
|
{
|
|
(*alrm)= &alarm->alarmed;
|
|
if (alarm_aborted)
|
|
{
|
|
alarm->alarmed.crono=0;
|
|
return 1;
|
|
}
|
|
if (!(alarm->alarmed.crono=SetTimer((HWND) NULL,0, sec*1000,
|
|
(TIMERPROC) NULL)))
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
|
|
bool thr_got_alarm(thr_alarm_t *alrm_ptr)
|
|
{
|
|
thr_alarm_t alrm= *alrm_ptr;
|
|
MSG msg;
|
|
if (alrm->crono)
|
|
{
|
|
PeekMessage(&msg,NULL,WM_TIMER,WM_TIMER,PM_REMOVE) ;
|
|
if (msg.message == WM_TIMER || alarm_aborted)
|
|
{
|
|
KillTimer(NULL, alrm->crono);
|
|
alrm->crono = 0;
|
|
}
|
|
}
|
|
return !alrm->crono || alarm_aborted;
|
|
}
|
|
|
|
|
|
void thr_end_alarm(thr_alarm_t *alrm_ptr)
|
|
{
|
|
thr_alarm_t alrm= *alrm_ptr;
|
|
/* alrm may be zero if thr_alarm aborted with an error */
|
|
if (alrm && alrm->crono)
|
|
|
|
{
|
|
KillTimer(NULL, alrm->crono);
|
|
alrm->crono = 0;
|
|
}
|
|
}
|
|
|
|
void end_thr_alarm(my_bool free_structures)
|
|
{
|
|
DBUG_ENTER("end_thr_alarm");
|
|
alarm_aborted=1; /* No more alarms */
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
void init_thr_alarm(uint max_alarm)
|
|
{
|
|
DBUG_ENTER("init_thr_alarm");
|
|
alarm_aborted=0; /* Yes, Gimmie alarms */
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
void thr_alarm_info(ALARM_INFO *info)
|
|
{
|
|
bzero((char*) info, sizeof(*info));
|
|
}
|
|
|
|
void resize_thr_alarm(uint max_alarms)
|
|
{
|
|
}
|
|
|
|
#endif /* __WIN__ */
|
|
|
|
#endif /* THREAD */
|
|
|
|
|
|
/****************************************************************************
|
|
Handling of test case (when compiled with -DMAIN)
|
|
***************************************************************************/
|
|
|
|
#ifdef MAIN
|
|
#if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
|
|
|
|
static pthread_cond_t COND_thread_count;
|
|
static pthread_mutex_t LOCK_thread_count;
|
|
static uint thread_count;
|
|
|
|
#ifdef HPUX10
|
|
typedef int * fd_set_ptr;
|
|
#else
|
|
typedef fd_set * fd_set_ptr;
|
|
#endif /* HPUX10 */
|
|
|
|
static void *test_thread(void *arg)
|
|
{
|
|
int i,param=*((int*) arg),wait_time,retry;
|
|
time_t start_time;
|
|
thr_alarm_t got_alarm;
|
|
fd_set fd;
|
|
FD_ZERO(&fd);
|
|
my_thread_init();
|
|
printf("Thread %d (%s) started\n",param,my_thread_name()); fflush(stdout);
|
|
for (i=1 ; i <= 10 ; i++)
|
|
{
|
|
wait_time=param ? 11-i : i;
|
|
start_time=time((time_t*) 0);
|
|
if (thr_alarm(&got_alarm,wait_time,0))
|
|
{
|
|
printf("Thread: %s Alarms aborted\n",my_thread_name());
|
|
break;
|
|
}
|
|
if (wait_time == 3)
|
|
{
|
|
printf("Thread: %s Simulation of no alarm needed\n",my_thread_name());
|
|
fflush(stdout);
|
|
}
|
|
else
|
|
{
|
|
for (retry=0 ; !thr_got_alarm(&got_alarm) && retry < 10 ; retry++)
|
|
{
|
|
printf("Thread: %s Waiting %d sec\n",my_thread_name(),wait_time);
|
|
select(0,(fd_set_ptr) &fd,0,0,0);
|
|
}
|
|
if (!thr_got_alarm(&got_alarm))
|
|
{
|
|
printf("Thread: %s didn't get an alarm. Aborting!\n",
|
|
my_thread_name());
|
|
break;
|
|
}
|
|
if (wait_time == 7)
|
|
{ /* Simulate alarm-miss */
|
|
fd_set readFDs;
|
|
uint max_connection=fileno(stdin);
|
|
FD_ZERO(&readFDs);
|
|
FD_SET(max_connection,&readFDs);
|
|
retry=0;
|
|
for (;;)
|
|
{
|
|
printf("Thread: %s Simulating alarm miss\n",my_thread_name());
|
|
fflush(stdout);
|
|
if (select(max_connection+1, (fd_set_ptr) &readFDs,0,0,0) < 0)
|
|
{
|
|
if (errno == EINTR)
|
|
break; /* Got new interrupt */
|
|
printf("Got errno: %d from select. Retrying..\n",errno);
|
|
if (retry++ >= 3)
|
|
{
|
|
printf("Warning: Interrupt of select() doesn't set errno!\n");
|
|
break;
|
|
}
|
|
}
|
|
else /* This shouldn't happen */
|
|
{
|
|
if (!FD_ISSET(max_connection,&readFDs))
|
|
{
|
|
printf("Select interrupted, but errno not set\n");
|
|
fflush(stdout);
|
|
if (retry++ >= 3)
|
|
break;
|
|
continue;
|
|
}
|
|
VOID(getchar()); /* Somebody was playing */
|
|
}
|
|
}
|
|
}
|
|
}
|
|
printf("Thread: %s Slept for %d (%d) sec\n",my_thread_name(),
|
|
(int) (time((time_t*) 0)-start_time), wait_time); fflush(stdout);
|
|
thr_end_alarm(&got_alarm);
|
|
fflush(stdout);
|
|
}
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thread_count--;
|
|
VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
free((gptr) arg);
|
|
return 0;
|
|
}
|
|
|
|
#ifdef USE_ONE_SIGNAL_HAND
|
|
static sig_handler print_signal_warning(int sig)
|
|
{
|
|
printf("Warning: Got signal %d from thread %s\n",sig,my_thread_name());
|
|
fflush(stdout);
|
|
#ifdef DONT_REMEMBER_SIGNAL
|
|
my_sigset(sig,print_signal_warning); /* int. thread system calls */
|
|
#endif
|
|
if (sig == SIGALRM)
|
|
alarm(2); /* reschedule alarm */
|
|
}
|
|
#endif /* USE_ONE_SIGNAL_HAND */
|
|
|
|
|
|
static void *signal_hand(void *arg __attribute__((unused)))
|
|
{
|
|
sigset_t set;
|
|
int sig,error,err_count=0;;
|
|
|
|
my_thread_init();
|
|
pthread_detach_this_thread();
|
|
init_thr_alarm(10); /* Setup alarm handler */
|
|
pthread_mutex_lock(&LOCK_thread_count); /* Required by bsdi */
|
|
VOID(pthread_cond_signal(&COND_thread_count)); /* Tell main we are ready */
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
|
|
sigemptyset(&set); /* Catch all signals */
|
|
sigaddset(&set,SIGINT);
|
|
sigaddset(&set,SIGQUIT);
|
|
sigaddset(&set,SIGTERM);
|
|
#if THR_CLIENT_ALARM != SIGHUP
|
|
sigaddset(&set,SIGHUP);
|
|
#endif
|
|
#ifdef SIGTSTP
|
|
sigaddset(&set,SIGTSTP);
|
|
#endif
|
|
#ifdef USE_ONE_SIGNAL_HAND
|
|
sigaddset(&set,THR_SERVER_ALARM); /* For alarms */
|
|
puts("Starting signal and alarm handling thread");
|
|
#else
|
|
puts("Starting signal handling thread");
|
|
#endif
|
|
printf("server alarm: %d thread alarm: %d\n",
|
|
THR_SERVER_ALARM,THR_CLIENT_ALARM);
|
|
DBUG_PRINT("info",("Starting signal and alarm handling thread"));
|
|
for(;;)
|
|
{
|
|
while ((error=my_sigwait(&set,&sig)) == EINTR)
|
|
printf("sigwait restarted\n");
|
|
if (error)
|
|
{
|
|
fprintf(stderr,"Got error %d from sigwait\n",error);
|
|
if (err_count++ > 5)
|
|
exit(1); /* Too many errors in test */
|
|
continue;
|
|
}
|
|
#ifdef USE_ONE_SIGNAL_HAND
|
|
if (sig != THR_SERVER_ALARM)
|
|
#endif
|
|
printf("Main thread: Got signal %d\n",sig);
|
|
switch (sig) {
|
|
case SIGINT:
|
|
case SIGQUIT:
|
|
case SIGTERM:
|
|
case SIGHUP:
|
|
printf("Aborting nicely\n");
|
|
end_thr_alarm(0);
|
|
break;
|
|
#ifdef SIGTSTP
|
|
case SIGTSTP:
|
|
printf("Aborting\n");
|
|
exit(1);
|
|
return 0; /* Keep some compilers happy */
|
|
#endif
|
|
#ifdef USE_ONE_SIGNAL_HAND
|
|
case THR_SERVER_ALARM:
|
|
process_alarm(sig);
|
|
break;
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
{
|
|
pthread_t tid;
|
|
pthread_attr_t thr_attr;
|
|
int i,*param,error;
|
|
sigset_t set;
|
|
ALARM_INFO alarm_info;
|
|
MY_INIT(argv[0]);
|
|
|
|
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == '#')
|
|
{
|
|
DBUG_PUSH(argv[1]+2);
|
|
}
|
|
pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
|
|
pthread_cond_init(&COND_thread_count,NULL);
|
|
|
|
/* Start a alarm handling thread */
|
|
sigemptyset(&set);
|
|
sigaddset(&set,SIGINT);
|
|
sigaddset(&set,SIGQUIT);
|
|
sigaddset(&set,SIGTERM);
|
|
sigaddset(&set,SIGHUP);
|
|
signal(SIGTERM,SIG_DFL); /* If it's blocked by parent */
|
|
#ifdef SIGTSTP
|
|
sigaddset(&set,SIGTSTP);
|
|
#endif
|
|
sigaddset(&set,THR_SERVER_ALARM);
|
|
sigdelset(&set,THR_CLIENT_ALARM);
|
|
(void) pthread_sigmask(SIG_SETMASK,&set,NULL);
|
|
#ifdef NOT_USED
|
|
sigemptyset(&set);
|
|
sigaddset(&set,THR_CLIENT_ALARM);
|
|
VOID(pthread_sigmask(SIG_UNBLOCK, &set, (sigset_t*) 0));
|
|
#endif
|
|
|
|
pthread_attr_init(&thr_attr);
|
|
pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
|
|
pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
|
|
pthread_attr_setstacksize(&thr_attr,65536L);
|
|
|
|
/* Start signal thread and wait for it to start */
|
|
VOID(pthread_mutex_lock(&LOCK_thread_count));
|
|
pthread_create(&tid,&thr_attr,signal_hand,NULL);
|
|
VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
|
|
VOID(pthread_mutex_unlock(&LOCK_thread_count));
|
|
DBUG_PRINT("info",("signal thread created"));
|
|
|
|
thr_setconcurrency(3);
|
|
pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_PROCESS);
|
|
printf("Main thread: %s\n",my_thread_name());
|
|
for (i=0 ; i < 2 ; i++)
|
|
{
|
|
param=(int*) malloc(sizeof(int));
|
|
*param= i;
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
if ((error=pthread_create(&tid,&thr_attr,test_thread,(void*) param)))
|
|
{
|
|
printf("Can't create thread %d, error: %d\n",i,error);
|
|
exit(1);
|
|
}
|
|
thread_count++;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
}
|
|
|
|
pthread_attr_destroy(&thr_attr);
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
thr_alarm_info(&alarm_info);
|
|
printf("Main_thread: Alarms: %u max_alarms: %u next_alarm_time: %lu\n",
|
|
alarm_info.active_alarms, alarm_info.max_used_alarms,
|
|
alarm_info.next_alarm_time);
|
|
while (thread_count)
|
|
{
|
|
VOID(pthread_cond_wait(&COND_thread_count,&LOCK_thread_count));
|
|
if (thread_count == 1)
|
|
{
|
|
printf("Calling end_thr_alarm. This should cancel the last thread\n");
|
|
end_thr_alarm(0);
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
thr_alarm_info(&alarm_info);
|
|
end_thr_alarm(1);
|
|
printf("Main_thread: Alarms: %u max_alarms: %u next_alarm_time: %lu\n",
|
|
alarm_info.active_alarms, alarm_info.max_used_alarms,
|
|
alarm_info.next_alarm_time);
|
|
printf("Test succeeded\n");
|
|
return 0;
|
|
}
|
|
|
|
#else /* THREAD */
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
{
|
|
#ifndef THREAD
|
|
printf("thr_alarm disabled because we are not using threads\n");
|
|
#else
|
|
printf("thr_alarm disabled with DONT_USE_THR_ALARM\n");
|
|
#endif
|
|
exit(1);
|
|
}
|
|
|
|
#endif /* THREAD */
|
|
#endif /* MAIN */
|