2001-12-06 13:10:51 +01:00
|
|
|
/* 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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
2000-07-31 21:29:14 +02:00
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2001-12-06 13:10:51 +01:00
|
|
|
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 */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2002-03-13 00:02:45 +01:00
|
|
|
/* To avoid problems with alarms in debug code, we disable DBUG here */
|
2006-10-12 19:43:47 +02:00
|
|
|
#define FORCE_DBUG_OFF
|
2001-09-14 01:54:33 +02:00
|
|
|
#include <my_global.h>
|
2000-08-21 23:18:32 +02:00
|
|
|
|
|
|
|
#if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
|
2000-07-31 21:29:14 +02:00
|
|
|
#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
|
|
|
|
|
2007-03-28 15:33:29 +02:00
|
|
|
uint thr_client_alarm;
|
2003-05-26 12:10:08 +02:00
|
|
|
static int alarm_aborted=1; /* No alarm thread */
|
2003-06-01 22:40:01 +02:00
|
|
|
my_bool thr_alarm_inited= 0;
|
|
|
|
volatile my_bool alarm_thread_running= 0;
|
2007-08-13 15:11:25 +02:00
|
|
|
time_t next_alarm_expire_time= ~ (time_t) 0;
|
2002-08-21 22:31:33 +02:00
|
|
|
static sig_handler process_alarm_part2(int sig);
|
|
|
|
|
2006-04-15 17:49:00 +02:00
|
|
|
#if !defined(__WIN__)
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
static pthread_mutex_t LOCK_alarm;
|
2003-06-01 22:40:01 +02:00
|
|
|
static pthread_cond_t COND_alarm;
|
2000-07-31 21:29:14 +02:00
|
|
|
static sigset_t full_signal_set;
|
|
|
|
static QUEUE alarm_queue;
|
2002-06-27 10:27:04 +02:00
|
|
|
static uint max_used_alarms=0;
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
|
|
|
|
|
|
|
static sig_handler thread_alarm(int sig __attribute__((unused)));
|
|
|
|
|
|
|
|
static int compare_ulong(void *not_used __attribute__((unused)),
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *a_ptr,uchar* b_ptr)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
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;
|
2007-08-13 15:11:25 +02:00
|
|
|
next_alarm_expire_time= ~ (time_t) 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
init_queue(&alarm_queue,max_alarms+1,offsetof(ALARM,expire_time),0,
|
|
|
|
compare_ulong,NullS);
|
|
|
|
sigfillset(&full_signal_set); /* Neaded to block signals */
|
2001-03-26 00:05:04 +02:00
|
|
|
pthread_mutex_init(&LOCK_alarm,MY_MUTEX_INIT_FAST);
|
2003-06-01 22:40:01 +02:00
|
|
|
pthread_cond_init(&COND_alarm,NULL);
|
2007-03-29 18:31:42 +02:00
|
|
|
if (thd_lib_detected == THD_LIB_LT)
|
|
|
|
thr_client_alarm= SIGALRM;
|
|
|
|
else
|
|
|
|
thr_client_alarm= SIGUSR1;
|
2007-03-28 15:33:29 +02:00
|
|
|
#ifndef USE_ALARM_THREAD
|
|
|
|
if (thd_lib_detected != THD_LIB_LT)
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif
|
2007-03-28 15:33:29 +02:00
|
|
|
{
|
|
|
|
my_sigset(thr_client_alarm, thread_alarm);
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
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() */
|
2007-03-28 15:33:29 +02:00
|
|
|
if (thd_lib_detected == THD_LIB_LT)
|
|
|
|
{
|
|
|
|
my_sigset(thr_client_alarm, process_alarm); /* Linuxthreads */
|
|
|
|
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
#else
|
2005-10-11 18:12:12 +02:00
|
|
|
my_sigset(THR_SERVER_ALARM, process_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
|
|
|
#endif
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2003-10-15 15:55:24 +02:00
|
|
|
|
2003-10-06 14:11:16 +02:00
|
|
|
void resize_thr_alarm(uint max_alarms)
|
|
|
|
{
|
|
|
|
pthread_mutex_lock(&LOCK_alarm);
|
2003-10-15 15:55:24 +02:00
|
|
|
/*
|
|
|
|
It's ok not to shrink the queue as there may be more pending alarms than
|
|
|
|
than max_alarms
|
|
|
|
*/
|
2003-10-06 14:11:16 +02:00
|
|
|
if (alarm_queue.elements < max_alarms)
|
|
|
|
resize_queue(&alarm_queue,max_alarms+1);
|
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
|
|
}
|
|
|
|
|
2003-10-15 15:55:24 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
/*
|
2002-06-27 10:27:04 +02:00
|
|
|
Request alarm after sec seconds.
|
2003-06-05 16:25:09 +02:00
|
|
|
|
|
|
|
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
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
|
|
|
|
2003-06-05 11:29:13 +02:00
|
|
|
my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm_data)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-08-13 15:11:25 +02:00
|
|
|
time_t now;
|
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
sigset_t old_mask;
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
my_bool reschedule;
|
2007-02-23 12:13:55 +01:00
|
|
|
struct st_my_thread_var *current_my_thread_var= my_thread_var;
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_ENTER("thr_alarm");
|
|
|
|
DBUG_PRINT("enter",("thread: %s sec: %d",my_thread_name(),sec));
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
now= my_time(0);
|
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2007-03-28 15:33:29 +02:00
|
|
|
pthread_mutex_lock(&LOCK_alarm); /* Lock from threads & alarms */
|
2003-05-26 12:10:08 +02:00
|
|
|
if (alarm_aborted > 0)
|
2000-07-31 21:29:14 +02:00
|
|
|
{ /* No signal thread */
|
|
|
|
DBUG_PRINT("info", ("alarm aborted"));
|
2003-05-26 12:10:08 +02:00
|
|
|
*alrm= 0; /* No alarm */
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
2003-05-26 12:10:08 +02:00
|
|
|
if (alarm_aborted < 0)
|
|
|
|
sec= 1; /* Abort mode */
|
|
|
|
|
2002-06-27 10:27:04 +02:00
|
|
|
if (alarm_queue.elements >= max_used_alarms)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-06-27 10:27:04 +02:00
|
|
|
if (alarm_queue.elements == alarm_queue.max_elements)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("alarm queue full"));
|
|
|
|
fprintf(stderr,"Warning: thr_alarm queue is full\n");
|
2003-05-26 12:10:08 +02:00
|
|
|
*alrm= 0; /* No alarm */
|
2002-06-27 10:27:04 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2002-06-27 10:27:04 +02:00
|
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2002-06-27 10:27:04 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
max_used_alarms=alarm_queue.elements+1;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2007-08-13 15:11:25 +02:00
|
|
|
reschedule= (ulong) next_alarm_expire_time > (ulong) now + sec;
|
2000-07-31 21:29:14 +02:00
|
|
|
if (!alarm_data)
|
|
|
|
{
|
|
|
|
if (!(alarm_data=(ALARM*) my_malloc(sizeof(ALARM),MYF(MY_WME))))
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("failed my_malloc()"));
|
2003-05-26 18:11:22 +02:00
|
|
|
*alrm= 0; /* No alarm */
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
}
|
|
|
|
alarm_data->malloced=1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
alarm_data->malloced=0;
|
|
|
|
alarm_data->expire_time=now+sec;
|
|
|
|
alarm_data->alarmed=0;
|
2007-02-23 12:13:55 +01:00
|
|
|
alarm_data->thread= current_my_thread_var->pthread_self;
|
|
|
|
alarm_data->thread_id= current_my_thread_var->id;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
queue_insert(&alarm_queue,(uchar*) alarm_data);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
/* Reschedule alarm if the current one has more than sec left */
|
|
|
|
if (reschedule)
|
|
|
|
{
|
|
|
|
DBUG_PRINT("info", ("reschedule"));
|
|
|
|
if (pthread_equal(pthread_self(),alarm_thread))
|
2007-08-13 15:11:25 +02:00
|
|
|
{
|
2000-07-31 21:29:14 +02:00
|
|
|
alarm(sec); /* purecov: inspected */
|
2007-08-13 15:11:25 +02:00
|
|
|
next_alarm_expire_time= now + sec;
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
else
|
|
|
|
reschedule_alarms(); /* Reschedule alarms */
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
(*alrm)= &alarm_data->alarmed;
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2002-06-27 10:27:04 +02:00
|
|
|
Remove alarm from list of alarms
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
void thr_end_alarm(thr_alarm_t *alarmed)
|
|
|
|
{
|
|
|
|
ALARM *alarm_data;
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
sigset_t old_mask;
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2003-06-10 20:42:29 +02:00
|
|
|
uint i, found=0;
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_ENTER("thr_end_alarm");
|
|
|
|
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_BLOCK,&full_signal_set,&old_mask);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
alarm_data= (ALARM*) ((uchar*) *alarmed - offsetof(ALARM,alarmed));
|
2000-07-31 21:29:14 +02:00
|
|
|
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)
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*) alarm_data,MYF(0));
|
2003-06-10 20:42:29 +02:00
|
|
|
found++;
|
2005-01-24 15:48:25 +01:00
|
|
|
#ifdef DBUG_OFF
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
2003-06-10 20:42:29 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
}
|
2003-06-10 20:42:29 +02:00
|
|
|
DBUG_ASSERT(!*alarmed || found == 1);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (!found)
|
|
|
|
{
|
2003-06-05 11:29:13 +02:00
|
|
|
if (*alarmed)
|
2004-08-23 12:46:51 +02:00
|
|
|
fprintf(stderr,"Warning: Didn't find alarm 0x%lx in queue of %d alarms\n",
|
2003-06-05 11:29:13 +02:00
|
|
|
(long) *alarmed, alarm_queue.elements);
|
2004-08-23 12:46:51 +02:00
|
|
|
DBUG_PRINT("warning",("Didn't find alarm 0x%lx in queue\n",
|
2002-08-21 21:04:22 +02:00
|
|
|
(long) *alarmed));
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2003-05-26 12:10:08 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
2007-08-13 15:11:25 +02:00
|
|
|
#ifndef USE_ONE_SIGNAL_HAND
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_sigmask(SIG_SETMASK,&old_mask,NULL);
|
2007-08-13 15:11:25 +02:00
|
|
|
#endif
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2002-06-27 10:27:04 +02:00
|
|
|
/*
|
|
|
|
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.
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
sig_handler process_alarm(int sig __attribute__((unused)))
|
|
|
|
{
|
|
|
|
sigset_t old_mask;
|
2002-08-21 21:04:22 +02:00
|
|
|
/*
|
|
|
|
This must be first as we can't call DBUG inside an alarm for a normal thread
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2007-03-28 15:33:29 +02:00
|
|
|
if (thd_lib_detected == THD_LIB_LT &&
|
|
|
|
!pthread_equal(pthread_self(),alarm_thread))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
#if defined(MAIN) && !defined(__bsdi__)
|
2006-11-27 22:19:53 +01:00
|
|
|
printf("thread_alarm in process_alarm\n"); fflush(stdout);
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif
|
|
|
|
#ifdef DONT_REMEMBER_SIGNAL
|
2007-03-28 15:33:29 +02:00
|
|
|
my_sigset(thr_client_alarm, process_alarm); /* int. thread system calls */
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif
|
2002-08-21 21:04:22 +02:00
|
|
|
return;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2002-08-21 22:31:33 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
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
|
|
|
|
*/
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
#ifndef USE_ALARM_THREAD
|
|
|
|
pthread_sigmask(SIG_SETMASK,&full_signal_set,&old_mask);
|
|
|
|
pthread_mutex_lock(&LOCK_alarm);
|
2002-08-21 21:04:22 +02:00
|
|
|
#endif
|
2002-08-21 22:31:33 +02:00
|
|
|
process_alarm_part2(sig);
|
|
|
|
#ifndef USE_ALARM_THREAD
|
|
|
|
#if defined(DONT_REMEMBER_SIGNAL) && !defined(USE_ONE_SIGNAL_HAND)
|
2005-10-11 18:12:12 +02:00
|
|
|
my_sigset(THR_SERVER_ALARM,process_alarm);
|
2002-08-21 22:31:33 +02:00
|
|
|
#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;
|
2002-08-21 21:04:22 +02:00
|
|
|
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);
|
2000-07-31 21:29:14 +02:00
|
|
|
#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) ||
|
2007-03-28 15:33:29 +02:00
|
|
|
pthread_kill(alarm_data->thread, thr_client_alarm))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
#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
|
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
ulong now=(ulong) my_time(0);
|
2000-07-31 21:29:14 +02:00
|
|
|
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) ||
|
2007-03-28 15:33:29 +02:00
|
|
|
pthread_kill(alarm_data->thread, thr_client_alarm))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
#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));
|
2007-08-13 15:11:25 +02:00
|
|
|
next_alarm_expire_time= alarm_data->expire_time;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
2007-08-13 15:11:25 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
Ensure that next time we call thr_alarm(), we will schedule a new alarm
|
|
|
|
*/
|
|
|
|
next_alarm_expire_time= ~(time_t) 0;
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2003-05-26 12:10:08 +02:00
|
|
|
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
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
|
|
|
|
2003-05-26 12:10:08 +02:00
|
|
|
void end_thr_alarm(my_bool free_structures)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("end_thr_alarm");
|
2003-06-01 22:40:01 +02:00
|
|
|
if (alarm_aborted != 1) /* If memory not freed */
|
2005-12-23 20:50:28 +01:00
|
|
|
{
|
2003-01-28 07:38:28 +01:00
|
|
|
pthread_mutex_lock(&LOCK_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_PRINT("info",("Resheduling %d waiting alarms",alarm_queue.elements));
|
2003-05-26 12:10:08 +02:00
|
|
|
alarm_aborted= -1; /* mark aborted */
|
2003-06-01 22:40:01 +02:00
|
|
|
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();
|
|
|
|
}
|
2003-05-26 12:10:08 +02:00
|
|
|
if (free_structures)
|
|
|
|
{
|
2003-06-01 22:40:01 +02:00
|
|
|
struct timespec abstime;
|
2005-12-23 20:50:28 +01:00
|
|
|
|
2003-05-26 12:10:08 +02:00
|
|
|
DBUG_ASSERT(!alarm_queue.elements);
|
2003-06-01 22:40:01 +02:00
|
|
|
|
2005-12-23 20:50:28 +01:00
|
|
|
/* Wait until alarm thread dies */
|
2003-06-01 22:40:01 +02:00
|
|
|
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 */
|
|
|
|
}
|
2005-12-23 20:50:28 +01:00
|
|
|
delete_queue(&alarm_queue);
|
|
|
|
alarm_aborted= 1;
|
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
|
|
if (!alarm_thread_running) /* Safety */
|
2003-05-26 12:10:08 +02:00
|
|
|
{
|
2005-12-23 20:50:28 +01:00
|
|
|
pthread_mutex_destroy(&LOCK_alarm);
|
|
|
|
pthread_cond_destroy(&COND_alarm);
|
2003-05-26 12:10:08 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2002-06-27 10:27:04 +02:00
|
|
|
Remove another thread from the alarm
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
void thr_alarm_kill(my_thread_id thread_id)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
uint i;
|
2003-02-25 23:13:18 +01:00
|
|
|
if (alarm_aborted)
|
|
|
|
return;
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
|
|
for (i=0 ; i < alarm_queue.elements ; i++)
|
|
|
|
{
|
2007-02-23 12:13:55 +01:00
|
|
|
if (((ALARM*) queue_element(&alarm_queue,i))->thread_id == thread_id)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
ALARM *tmp=(ALARM*) queue_remove(&alarm_queue,i);
|
|
|
|
tmp->expire_time=0;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
queue_insert(&alarm_queue,(uchar*) tmp);
|
2000-07-31 21:29:14 +02:00
|
|
|
reschedule_alarms();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-06-27 10:27:04 +02:00
|
|
|
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))
|
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
ulong now=(ulong) my_time(0);
|
2002-06-27 10:27:04 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
/*
|
2002-06-27 10:27:04 +02:00
|
|
|
This is here for thread to get interruptet from read/write/fcntl
|
|
|
|
ARGSUSED
|
2000-07-31 21:29:14 +02:00
|
|
|
*/
|
|
|
|
|
2007-03-28 15:33:29 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
static sig_handler thread_alarm(int sig)
|
|
|
|
{
|
|
|
|
#ifdef MAIN
|
|
|
|
printf("thread_alarm\n"); fflush(stdout);
|
|
|
|
#endif
|
|
|
|
#ifdef DONT_REMEMBER_SIGNAL
|
2005-10-11 18:12:12 +02:00
|
|
|
my_sigset(sig,thread_alarm); /* int. thread system calls */
|
2000-07-31 21:29:14 +02:00
|
|
|
#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();
|
2003-06-01 22:40:01 +02:00
|
|
|
alarm_thread_running= 1;
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_mutex_lock(&LOCK_alarm);
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
if (alarm_queue.elements)
|
|
|
|
{
|
2007-07-30 10:33:50 +02:00
|
|
|
ulong sleep_time,now= my_time(0);
|
2000-07-31 21:29:14 +02:00
|
|
|
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;
|
2007-08-13 15:11:25 +02:00
|
|
|
next_alarm_expire_time= sleep_time;
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2003-06-01 22:40:01 +02:00
|
|
|
else if (alarm_aborted == -1)
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
2007-08-13 15:11:25 +02:00
|
|
|
else
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2007-08-13 15:11:25 +02:00
|
|
|
next_alarm_expire_time= ~ (time_t) 0;
|
|
|
|
if ((error=pthread_cond_wait(&COND_alarm,&LOCK_alarm)))
|
|
|
|
{
|
2000-07-31 21:29:14 +02:00
|
|
|
#ifdef MAIN
|
2007-08-13 15:11:25 +02:00
|
|
|
printf("Got error: %d from ptread_cond_wait (errno: %d)\n",
|
|
|
|
error,errno);
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif
|
2007-08-13 15:11:25 +02:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
process_alarm(0);
|
|
|
|
}
|
|
|
|
bzero((char*) &alarm_thread,sizeof(alarm_thread)); /* For easy debugging */
|
2003-06-01 22:40:01 +02:00
|
|
|
alarm_thread_running= 0;
|
|
|
|
pthread_cond_signal(&COND_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
pthread_mutex_unlock(&LOCK_alarm);
|
|
|
|
pthread_exit(0);
|
|
|
|
return 0; /* Impossible */
|
|
|
|
}
|
2000-08-21 23:18:32 +02:00
|
|
|
#endif /* USE_ALARM_THREAD */
|
|
|
|
|
|
|
|
/*****************************************************************************
|
2002-06-27 10:27:04 +02:00
|
|
|
thr_alarm for win95
|
2000-08-21 23:18:32 +02:00
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
#else /* __WIN__ */
|
|
|
|
|
2007-02-23 12:13:55 +01:00
|
|
|
void thr_alarm_kill(my_thread_id thread_id)
|
2000-11-28 03:47:47 +01:00
|
|
|
{
|
|
|
|
/* Can't do this yet */
|
|
|
|
}
|
|
|
|
|
|
|
|
sig_handler process_alarm(int sig __attribute__((unused)))
|
|
|
|
{
|
|
|
|
/* Can't do this yet */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-03 02:34:19 +02:00
|
|
|
my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm)
|
2000-08-21 23:18:32 +02:00
|
|
|
{
|
2002-09-11 05:40:08 +02:00
|
|
|
(*alrm)= &alarm->alarmed;
|
2000-08-21 23:18:32 +02:00
|
|
|
if (alarm_aborted)
|
|
|
|
{
|
2000-11-28 03:47:47 +01:00
|
|
|
alarm->alarmed.crono=0;
|
2000-08-21 23:18:32 +02:00
|
|
|
return 1;
|
|
|
|
}
|
2000-11-28 03:47:47 +01:00
|
|
|
if (!(alarm->alarmed.crono=SetTimer((HWND) NULL,0, sec*1000,
|
|
|
|
(TIMERPROC) NULL)))
|
2000-08-21 23:18:32 +02:00
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-02-19 18:45:11 +01:00
|
|
|
my_bool thr_got_alarm(thr_alarm_t *alrm_ptr)
|
2000-08-21 23:18:32 +02:00
|
|
|
{
|
2000-11-28 03:47:47 +01:00
|
|
|
thr_alarm_t alrm= *alrm_ptr;
|
2000-08-21 23:18:32 +02:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-11-28 03:47:47 +01:00
|
|
|
void thr_end_alarm(thr_alarm_t *alrm_ptr)
|
2000-08-21 23:18:32 +02:00
|
|
|
{
|
2000-11-28 03:47:47 +01:00
|
|
|
thr_alarm_t alrm= *alrm_ptr;
|
2003-11-17 11:59:07 +01:00
|
|
|
/* alrm may be zero if thr_alarm aborted with an error */
|
2002-09-10 09:36:19 +02:00
|
|
|
if (alrm && alrm->crono)
|
2003-11-17 15:16:56 +01:00
|
|
|
|
2000-08-21 23:18:32 +02:00
|
|
|
{
|
|
|
|
KillTimer(NULL, alrm->crono);
|
|
|
|
alrm->crono = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-05-26 12:10:08 +02:00
|
|
|
void end_thr_alarm(my_bool free_structures)
|
2000-08-21 23:18:32 +02:00
|
|
|
{
|
|
|
|
DBUG_ENTER("end_thr_alarm");
|
|
|
|
alarm_aborted=1; /* No more alarms */
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2000-11-28 03:47:47 +01:00
|
|
|
void init_thr_alarm(uint max_alarm)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("init_thr_alarm");
|
|
|
|
alarm_aborted=0; /* Yes, Gimmie alarms */
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2002-06-27 10:27:04 +02:00
|
|
|
void thr_alarm_info(ALARM_INFO *info)
|
|
|
|
{
|
|
|
|
bzero((char*) info, sizeof(*info));
|
|
|
|
}
|
|
|
|
|
2003-11-02 14:55:02 +01:00
|
|
|
void resize_thr_alarm(uint max_alarms)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2000-08-21 23:18:32 +02:00
|
|
|
#endif /* __WIN__ */
|
|
|
|
|
|
|
|
#endif /* THREAD */
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2000-08-21 23:18:32 +02:00
|
|
|
/****************************************************************************
|
2002-06-27 10:27:04 +02:00
|
|
|
Handling of test case (when compiled with -DMAIN)
|
2000-08-21 23:18:32 +02:00
|
|
|
***************************************************************************/
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
#ifdef MAIN
|
2000-08-21 23:18:32 +02:00
|
|
|
#if defined(THREAD) && !defined(DONT_USE_THR_ALARM)
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
static pthread_cond_t COND_thread_count;
|
|
|
|
static pthread_mutex_t LOCK_thread_count;
|
|
|
|
static uint thread_count;
|
|
|
|
|
2002-10-24 14:30:25 +02:00
|
|
|
#ifdef HPUX10
|
2000-07-31 21:29:14 +02:00
|
|
|
typedef int * fd_set_ptr;
|
|
|
|
#else
|
|
|
|
typedef fd_set * fd_set_ptr;
|
2002-10-24 14:30:25 +02:00
|
|
|
#endif /* HPUX10 */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
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();
|
2001-02-01 13:25:51 +01:00
|
|
|
printf("Thread %d (%s) started\n",param,my_thread_name()); fflush(stdout);
|
2000-07-31 21:29:14 +02:00
|
|
|
for (i=1 ; i <= 10 ; i++)
|
|
|
|
{
|
|
|
|
wait_time=param ? 11-i : i;
|
2007-07-30 10:33:50 +02:00
|
|
|
start_time= my_time(0);
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
|
|
|
{
|
2000-11-28 03:47:47 +01:00
|
|
|
for (retry=0 ; !thr_got_alarm(&got_alarm) && retry < 10 ; retry++)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
printf("Thread: %s Waiting %d sec\n",my_thread_name(),wait_time);
|
|
|
|
select(0,(fd_set_ptr) &fd,0,0,0);
|
|
|
|
}
|
2000-11-28 03:47:47 +01:00
|
|
|
if (!thr_got_alarm(&got_alarm))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
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(),
|
2007-07-30 10:33:50 +02:00
|
|
|
(int) (my_time(0)-start_time), wait_time); fflush(stdout);
|
2000-07-31 21:29:14 +02:00
|
|
|
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);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
free((uchar*) arg);
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
2005-10-11 18:12:12 +02:00
|
|
|
my_sigset(sig,print_signal_warning); /* int. thread system calls */
|
2000-07-31 21:29:14 +02:00
|
|
|
#endif
|
|
|
|
if (sig == SIGALRM)
|
|
|
|
alarm(2); /* reschedule alarm */
|
|
|
|
}
|
2000-08-21 23:18:32 +02:00
|
|
|
#endif /* USE_ONE_SIGNAL_HAND */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
sigaddset(&set,SIGHUP);
|
|
|
|
#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",
|
2007-03-28 15:33:29 +02:00
|
|
|
THR_SERVER_ALARM, thr_client_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
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");
|
2003-05-26 12:10:08 +02:00
|
|
|
end_thr_alarm(0);
|
2000-07-31 21:29:14 +02:00
|
|
|
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;
|
2002-06-27 10:27:04 +02:00
|
|
|
ALARM_INFO alarm_info;
|
2000-07-31 21:29:14 +02:00
|
|
|
MY_INIT(argv[0]);
|
|
|
|
|
|
|
|
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == '#')
|
2006-11-27 22:19:53 +01:00
|
|
|
{
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_PUSH(argv[1]+2);
|
2006-11-27 22:19:53 +01:00
|
|
|
}
|
2001-03-26 00:05:04 +02:00
|
|
|
pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
|
2000-07-31 21:29:14 +02:00
|
|
|
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);
|
2007-03-28 15:33:29 +02:00
|
|
|
sigdelset(&set, thr_client_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
(void) pthread_sigmask(SIG_SETMASK,&set,NULL);
|
|
|
|
#ifdef NOT_USED
|
|
|
|
sigemptyset(&set);
|
2007-03-28 15:33:29 +02:00
|
|
|
sigaddset(&set, thr_client_alarm);
|
2000-07-31 21:29:14 +02:00
|
|
|
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);
|
2002-06-27 10:27:04 +02:00
|
|
|
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);
|
2000-07-31 21:29:14 +02:00
|
|
|
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");
|
2003-05-26 12:10:08 +02:00
|
|
|
end_thr_alarm(0);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
2002-06-27 10:27:04 +02:00
|
|
|
thr_alarm_info(&alarm_info);
|
2006-11-27 22:19:53 +01:00
|
|
|
end_thr_alarm(1);
|
2002-06-27 10:27:04 +02:00
|
|
|
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);
|
2000-07-31 21:29:14 +02:00
|
|
|
printf("Test succeeded\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-08-21 23:18:32 +02:00
|
|
|
#else /* THREAD */
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
|
|
{
|
2000-08-21 23:18:32 +02:00
|
|
|
#ifndef THREAD
|
|
|
|
printf("thr_alarm disabled because we are not using threads\n");
|
|
|
|
#else
|
2000-07-31 21:29:14 +02:00
|
|
|
printf("thr_alarm disabled with DONT_USE_THR_ALARM\n");
|
|
|
|
#endif
|
2000-08-21 23:18:32 +02:00
|
|
|
exit(1);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2000-08-21 23:18:32 +02:00
|
|
|
#endif /* THREAD */
|
|
|
|
#endif /* MAIN */
|