mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
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
BitKeeper/etc/ignore:
added libmysqld/ha_ndbcluster_cond.cc
---
added debian/defs.mk debian/control
client/completion_hash.cc:
Remove not needed casts
client/my_readline.h:
Remove some old types
client/mysql.cc:
Simplify types
client/mysql_upgrade.c:
Remove some old types
Update call to dirname_part
client/mysqladmin.cc:
Remove some old types
client/mysqlbinlog.cc:
Remove some old types
Change some buffers to be uchar to avoid casts
client/mysqlcheck.c:
Remove some old types
client/mysqldump.c:
Remove some old types
Remove some not needed casts
Change some string lengths to size_t
client/mysqlimport.c:
Remove some old types
client/mysqlshow.c:
Remove some old types
client/mysqlslap.c:
Remove some old types
Remove some not needed casts
client/mysqltest.c:
Removed some old types
Removed some not needed casts
Updated hash-get-key function arguments
Updated parameters to dirname_part()
client/readline.cc:
Removed some old types
Removed some not needed casts
Changed some string lengths to use size_t
client/sql_string.cc:
Removed some old types
dbug/dbug.c:
Removed some old types
Changed some string lengths to use size_t
Changed some prototypes to avoid casts
extra/comp_err.c:
Removed some old types
extra/innochecksum.c:
Removed some old types
extra/my_print_defaults.c:
Removed some old types
extra/mysql_waitpid.c:
Removed some old types
extra/perror.c:
Removed some old types
extra/replace.c:
Removed some old types
Updated parameters to dirname_part()
extra/resolve_stack_dump.c:
Removed some old types
extra/resolveip.c:
Removed some old types
include/config-win.h:
Removed some old types
include/decimal.h:
Changed binary strings to be uchar* instead of char*
include/ft_global.h:
Removed some old types
include/hash.h:
Removed some old types
include/heap.h:
Removed some old types
Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable
include/keycache.h:
Removed some old types
include/m_ctype.h:
Removed some old types
Changed some string lengths to use size_t
Changed character length functions to return uint
unsigned char -> uchar
include/m_string.h:
Removed some old types
Changed some string lengths to use size_t
include/my_alloc.h:
Changed some string lengths to use size_t
include/my_base.h:
Removed some old types
include/my_dbug.h:
Removed some old types
Changed some string lengths to use size_t
Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage
include/my_getopt.h:
Removed some old types
include/my_global.h:
Removed old types:
my_size_t -> size_t
byte -> uchar
gptr -> uchar *
include/my_list.h:
Removed some old types
include/my_nosys.h:
Removed some old types
include/my_pthread.h:
Removed some old types
include/my_sys.h:
Removed some old types
Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read()
Changed some string lengths to use size_t
my_malloc() / my_free() now uses void *
Updated parameters to dirname_part() & my_uncompress()
include/my_tree.h:
Removed some old types
include/my_trie.h:
Removed some old types
include/my_user.h:
Changed some string lengths to use size_t
include/my_vle.h:
Removed some old types
include/my_xml.h:
Removed some old types
Changed some string lengths to use size_t
include/myisam.h:
Removed some old types
include/myisammrg.h:
Removed some old types
include/mysql.h:
Removed some old types
Changed byte streams to use uchar* instead of char*
include/mysql_com.h:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
include/queues.h:
Removed some old types
include/sql_common.h:
Removed some old types
include/sslopt-longopts.h:
Removed some old types
include/violite.h:
Removed some old types
Changed some string lengths to use size_t
libmysql/client_settings.h:
Removed some old types
libmysql/libmysql.c:
Removed some old types
libmysql/manager.c:
Removed some old types
libmysqld/emb_qcache.cc:
Removed some old types
libmysqld/emb_qcache.h:
Removed some old types
libmysqld/lib_sql.cc:
Removed some old types
Removed some not needed casts
Changed some buffers to be uchar* to avoid casts
true -> TRUE, false -> FALSE
mysys/array.c:
Removed some old types
mysys/charset.c:
Changed some string lengths to use size_t
mysys/checksum.c:
Include zlib to get definition for crc32
Removed some old types
mysys/default.c:
Removed some old types
Changed some string lengths to use size_t
mysys/default_modify.c:
Changed some string lengths to use size_t
Removed some not needed casts
mysys/hash.c:
Removed some old types
Changed some string lengths to use size_t
Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function.
hash_element now takes 'ulong' as the index type (cleanup)
mysys/list.c:
Removed some old types
mysys/mf_cache.c:
Changed some string lengths to use size_t
mysys/mf_dirname.c:
Removed some old types
Changed some string lengths to use size_t
Added argument to dirname_part() to avoid calculation of length for 'to'
mysys/mf_fn_ext.c:
Removed some old types
Updated parameters to dirname_part()
mysys/mf_format.c:
Removed some old types
Changed some string lengths to use size_t
mysys/mf_getdate.c:
Removed some old types
mysys/mf_iocache.c:
Removed some old types
Changed some string lengths to use size_t
Changed calculation of 'max_length' to be done the same way in all functions
mysys/mf_iocache2.c:
Removed some old types
Changed some string lengths to use size_t
Clean up comments
Removed not needed indentation
mysys/mf_keycache.c:
Removed some old types
mysys/mf_keycaches.c:
Removed some old types
mysys/mf_loadpath.c:
Removed some old types
mysys/mf_pack.c:
Removed some old types
Changed some string lengths to use size_t
Removed some not needed casts
Removed very old VMS code
Updated parameters to dirname_part()
Use result of dirnam_part() to remove call to strcat()
mysys/mf_path.c:
Removed some old types
mysys/mf_radix.c:
Removed some old types
mysys/mf_same.c:
Removed some old types
mysys/mf_sort.c:
Removed some old types
mysys/mf_soundex.c:
Removed some old types
mysys/mf_strip.c:
Removed some old types
mysys/mf_tempdir.c:
Removed some old types
mysys/mf_unixpath.c:
Removed some old types
mysys/mf_wfile.c:
Removed some old types
mysys/mulalloc.c:
Removed some old types
mysys/my_alloc.c:
Removed some old types
Changed some string lengths to use size_t
Use void* as type for allocated memory area
Removed some not needed casts
Changed argument 'Size' to 'length' according coding guidelines
mysys/my_chsize.c:
Changed some buffers to be uchar* to avoid casts
mysys/my_compress.c:
More comments
Removed some old types
Changed string lengths to use size_t
Changed arguments to my_uncompress() to make them easier to understand
Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix)
Changed type of 'pack_data' argument to packfrm() to avoid casts.
mysys/my_conio.c:
Changed some string lengths to use size_t
mysys/my_create.c:
Removed some old types
mysys/my_div.c:
Removed some old types
mysys/my_error.c:
Removed some old types
mysys/my_fopen.c:
Removed some old types
mysys/my_fstream.c:
Removed some old types
Changed some string lengths to use size_t
writen -> written
mysys/my_getopt.c:
Removed some old types
mysys/my_getwd.c:
Removed some old types
More comments
mysys/my_init.c:
Removed some old types
mysys/my_largepage.c:
Removed some old types
Changed some string lengths to use size_t
mysys/my_lib.c:
Removed some old types
mysys/my_lockmem.c:
Removed some old types
mysys/my_malloc.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed all functions to use size_t
mysys/my_memmem.c:
Indentation cleanup
mysys/my_once.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
mysys/my_open.c:
Removed some old types
mysys/my_pread.c:
Removed some old types
Changed all functions to use size_t
Added comment for how my_pread() / my_pwrite() are supposed to work.
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.
(If we ever would really need this, it should be enabled only with a flag argument)
mysys/my_quick.c:
Removed some old types
Changed all functions to use size_t
mysys/my_read.c:
Removed some old types
Changed all functions to use size_t
mysys/my_realloc.c:
Removed some old types
Use void* as type for allocated memory area
Changed all functions to use size_t
mysys/my_static.c:
Removed some old types
mysys/my_static.h:
Removed some old types
mysys/my_vle.c:
Removed some old types
mysys/my_wincond.c:
Removed some old types
mysys/my_windac.c:
Removed some old types
mysys/my_write.c:
Removed some old types
Changed all functions to use size_t
mysys/ptr_cmp.c:
Removed some old types
Changed all functions to use size_t
mysys/queues.c:
Removed some old types
mysys/safemalloc.c:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed all functions to use size_t
mysys/string.c:
Removed some old types
Changed all functions to use size_t
mysys/testhash.c:
Removed some old types
mysys/thr_alarm.c:
Removed some old types
mysys/thr_lock.c:
Removed some old types
mysys/tree.c:
Removed some old types
mysys/trie.c:
Removed some old types
mysys/typelib.c:
Removed some old types
plugin/daemon_example/daemon_example.cc:
Removed some old types
regex/reginit.c:
Removed some old types
server-tools/instance-manager/buffer.cc:
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/buffer.h:
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/commands.cc:
Removed some old types
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/instance_map.cc:
Removed some old types
Changed some string lengths to use size_t
Changed buffer to be of type uchar*
server-tools/instance-manager/instance_options.cc:
Changed buffer to be of type uchar*
Replaced alloc_root + strcpy() with strdup_root()
server-tools/instance-manager/mysql_connection.cc:
Changed buffer to be of type uchar*
server-tools/instance-manager/options.cc:
Removed some old types
server-tools/instance-manager/parse.cc:
Changed some string lengths to use size_t
server-tools/instance-manager/parse.h:
Removed some old types
Changed some string lengths to use size_t
server-tools/instance-manager/protocol.cc:
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
server-tools/instance-manager/protocol.h:
Changed some string lengths to use size_t
server-tools/instance-manager/user_map.cc:
Removed some old types
Changed some string lengths to use size_t
sql/derror.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/discover.cc:
Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
sql/event_data_objects.cc:
Removed some old types
Added missing casts for alloc() and sprintf()
sql/event_db_repository.cc:
Changed some buffers to be uchar* to avoid casts
Added missing casts for sprintf()
sql/event_queue.cc:
Removed some old types
sql/field.cc:
Removed some old types
Changed memory buffers to be uchar*
Changed some string lengths to use size_t
Removed a lot of casts
Safety fix in Field_blob::val_decimal() to not access zero pointer
sql/field.h:
Removed some old types
Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes).
Changed some string lengths to use size_t
Removed some not needed casts
Changed val_xxx(xxx, new_ptr) to take const pointers
sql/field_conv.cc:
Removed some old types
Added casts required because memory area pointers are now uchar*
sql/filesort.cc:
Initalize variable that was used unitialized in error conditions
sql/gen_lex_hash.cc:
Removed some old types
Changed memory buffers to be uchar*
Changed some string lengths to use size_t
Removed a lot of casts
Safety fix in Field_blob::val_decimal() to not access zero pointer
sql/gstream.h:
Added required cast
sql/ha_ndbcluster.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
Added required casts
Removed some not needed casts
sql/ha_ndbcluster.h:
Removed some old types
sql/ha_ndbcluster_binlog.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake()
Changed some string lengths to use size_t
Added missing casts for alloc() and sprintf()
sql/ha_ndbcluster_binlog.h:
Removed some old types
sql/ha_ndbcluster_cond.cc:
Removed some old types
Removed some not needed casts
sql/ha_ndbcluster_cond.h:
Removed some old types
sql/ha_partition.cc:
Removed some old types
Changed prototype for change_partition() to avoid casts
sql/ha_partition.h:
Removed some old types
sql/handler.cc:
Removed some old types
Changed some string lengths to use size_t
sql/handler.h:
Removed some old types
Changed some string lengths to use size_t
Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts
sql/hash_filo.h:
Removed some old types
Changed all functions to use size_t
sql/hostname.cc:
Removed some old types
sql/item.cc:
Removed some old types
Changed some string lengths to use size_t
Use strmake() instead of memdup() to create a null terminated string.
Updated calls to new Field()
sql/item.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed some buffers to be uchar* to avoid casts
sql/item_cmpfunc.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/item_cmpfunc.h:
Removed some old types
sql/item_create.cc:
Removed some old types
sql/item_func.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added test for failing alloc() in init_result_field()
Remove old confusing comment
Fixed compiler warning
sql/item_func.h:
Removed some old types
sql/item_row.cc:
Removed some old types
sql/item_row.h:
Removed some old types
sql/item_strfunc.cc:
Include zlib (needed becasue we call crc32)
Removed some old types
sql/item_strfunc.h:
Removed some old types
Changed some types to match new function prototypes
sql/item_subselect.cc:
Removed some old types
sql/item_subselect.h:
Removed some old types
sql/item_sum.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/item_sum.h:
Removed some old types
sql/item_timefunc.cc:
Removed some old types
Changed some string lengths to use size_t
sql/item_timefunc.h:
Removed some old types
sql/item_xmlfunc.cc:
Changed some string lengths to use size_t
sql/item_xmlfunc.h:
Removed some old types
sql/key.cc:
Removed some old types
Removed some not needed casts
sql/lock.cc:
Removed some old types
Added some cast to my_multi_malloc() arguments for safety
sql/log.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Changed usage of pwrite() to not assume it holds the cursor position for the file
Made usage of my_read() safer
sql/log_event.cc:
Removed some old types
Added checking of return value of malloc() in pack_info()
Changed some buffers to be uchar* to avoid casts
Removed some 'const' to avoid casts
Added missing casts for alloc() and sprintf()
Added required casts
Removed some not needed casts
Added some cast to my_multi_malloc() arguments for safety
sql/log_event.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/log_event_old.cc:
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/log_event_old.h:
Changed some buffers to be uchar* to avoid casts
sql/mf_iocache.cc:
Removed some old types
sql/my_decimal.cc:
Changed memory area to use uchar*
sql/my_decimal.h:
Changed memory area to use uchar*
sql/mysql_priv.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Changed some string lengths to use size_t
Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow
Changed some buffers to be uchar* to avoid casts
sql/mysqld.cc:
Removed some old types
sql/net_serv.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Ensure that vio_read()/vio_write() return values are stored in a size_t variable
Removed some not needed casts
sql/opt_range.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/opt_range.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/opt_sum.cc:
Removed some old types
Removed some not needed casts
sql/parse_file.cc:
Removed some old types
Changed some string lengths to use size_t
Changed alloc_root + memcpy + set end 0 -> strmake_root()
sql/parse_file.h:
Removed some old types
sql/partition_info.cc:
Removed some old types
Added missing casts for alloc()
Changed some buffers to be uchar* to avoid casts
sql/partition_info.h:
Changed some buffers to be uchar* to avoid casts
sql/protocol.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/protocol.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/records.cc:
Removed some old types
sql/repl_failsafe.cc:
Removed some old types
Changed some string lengths to use size_t
Added required casts
sql/rpl_filter.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some string lengths to use size_t
sql/rpl_filter.h:
Changed some string lengths to use size_t
sql/rpl_injector.h:
Removed some old types
sql/rpl_record.cc:
Removed some old types
Removed some not needed casts
Changed some buffers to be uchar* to avoid casts
sql/rpl_record.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/rpl_record_old.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/rpl_record_old.h:
Removed some old types
Changed some buffers to be uchar* to avoid cast
sql/rpl_rli.cc:
Removed some old types
sql/rpl_tblmap.cc:
Removed some old types
sql/rpl_tblmap.h:
Removed some old types
sql/rpl_utility.cc:
Removed some old types
sql/rpl_utility.h:
Removed some old types
Changed type of 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
sql/set_var.cc:
Removed some old types
Updated parameters to dirname_part()
sql/set_var.h:
Removed some old types
sql/slave.cc:
Removed some old types
Changed some string lengths to use size_t
sql/slave.h:
Removed some old types
sql/sp.cc:
Removed some old types
Added missing casts for printf()
sql/sp.h:
Removed some old types
Updated hash-get-key function arguments
sql/sp_cache.cc:
Removed some old types
Added missing casts for printf()
Updated hash-get-key function arguments
sql/sp_head.cc:
Removed some old types
Added missing casts for alloc() and printf()
Added required casts
Updated hash-get-key function arguments
sql/sp_head.h:
Removed some old types
sql/sp_pcontext.cc:
Removed some old types
sql/sp_pcontext.h:
Removed some old types
sql/sql_acl.cc:
Removed some old types
Changed some string lengths to use size_t
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added required casts
sql/sql_analyse.cc:
Changed some buffers to be uchar* to avoid casts
sql/sql_analyse.h:
Changed some buffers to be uchar* to avoid casts
sql/sql_array.h:
Removed some old types
sql/sql_base.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_binlog.cc:
Removed some old types
Added missing casts for printf()
sql/sql_cache.cc:
Removed some old types
Updated hash-get-key function arguments
Removed some not needed casts
Changed some string lengths to use size_t
sql/sql_cache.h:
Removed some old types
Removed reference to not existing function cache_key()
Updated hash-get-key function arguments
sql/sql_class.cc:
Removed some old types
Updated hash-get-key function arguments
Added missing casts for alloc()
Updated hash-get-key function arguments
Moved THD::max_row_length() to table.cc (as it's not depending on THD)
Removed some not needed casts
sql/sql_class.h:
Removed some old types
Changed malloc(), free() and related functions to use void *
Removed some not needed casts
Changed some string lengths to use size_t
Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD
sql/sql_connect.cc:
Removed some old types
Added required casts
sql/sql_db.cc:
Removed some old types
Removed some not needed casts
Added some cast to my_multi_malloc() arguments for safety
Added missing casts for alloc()
sql/sql_delete.cc:
Removed some old types
sql/sql_handler.cc:
Removed some old types
Updated hash-get-key function arguments
Added some cast to my_multi_malloc() arguments for safety
sql/sql_help.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_insert.cc:
Removed some old types
Added missing casts for alloc() and printf()
sql/sql_lex.cc:
Removed some old types
sql/sql_lex.h:
Removed some old types
Removed some not needed casts
sql/sql_list.h:
Removed some old types
Removed some not needed casts
sql/sql_load.cc:
Removed some old types
Removed compiler warning
sql/sql_manager.cc:
Removed some old types
sql/sql_map.cc:
Removed some old types
sql/sql_map.h:
Removed some old types
sql/sql_olap.cc:
Removed some old types
sql/sql_parse.cc:
Removed some old types
Trivial move of code lines to make things more readable
Changed some string lengths to use size_t
Added missing casts for alloc()
sql/sql_partition.cc:
Removed some old types
Removed compiler warnings about not used functions
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_partition.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/sql_plugin.cc:
Removed some old types
Added missing casts for alloc()
Updated hash-get-key function arguments
sql/sql_prepare.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Added missing casts for alloc() and printf()
sql-common/client.c:
Removed some old types
Changed some memory areas to use uchar*
sql-common/my_user.c:
Changed some string lengths to use size_t
sql-common/pack.c:
Changed some buffers to be uchar* to avoid casts
sql/sql_repl.cc:
Added required casts
Changed some buffers to be uchar* to avoid casts
Changed some string lengths to use size_t
sql/sql_select.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some old types
sql/sql_select.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
sql/sql_servers.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_show.cc:
Removed some old types
Added missing casts for alloc()
Removed some not needed casts
sql/sql_string.cc:
Removed some old types
Added required casts
sql/sql_table.cc:
Removed some old types
Removed compiler warning about not used variable
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
sql/sql_test.cc:
Removed some old types
sql/sql_trigger.cc:
Removed some old types
Added missing casts for alloc()
sql/sql_udf.cc:
Removed some old types
Updated hash-get-key function arguments
sql/sql_union.cc:
Removed some old types
sql/sql_update.cc:
Removed some old types
Removed some not needed casts
sql/sql_view.cc:
Removed some old types
sql/sql_yacc.yy:
Removed some old types
Changed some string lengths to use size_t
Added missing casts for alloc()
sql/stacktrace.c:
Removed some old types
sql/stacktrace.h:
Removed some old types
sql/structs.h:
Removed some old types
sql/table.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
Removed setting of LEX_STRING() arguments in declaration
Added required casts
More function comments
Moved max_row_length() here from sql_class.cc/sql_class.h
sql/table.h:
Removed some old types
Changed some string lengths to use size_t
sql/thr_malloc.cc:
Use void* as type for allocated memory area
Changed all functions to use size_t
sql/tzfile.h:
Changed some buffers to be uchar* to avoid casts
sql/tztime.cc:
Changed some buffers to be uchar* to avoid casts
Updated hash-get-key function arguments
Added missing casts for alloc()
Removed some not needed casts
sql/uniques.cc:
Removed some old types
Removed some not needed casts
sql/unireg.cc:
Removed some old types
Changed some buffers to be uchar* to avoid casts
Removed some not needed casts
Added missing casts for alloc()
storage/archive/archive_reader.c:
Removed some old types
storage/archive/azio.c:
Removed some old types
Removed some not needed casts
storage/archive/ha_archive.cc:
Removed some old types
Changed type for 'frmblob' in archive_discover() to match handler
Updated hash-get-key function arguments
Removed some not needed casts
storage/archive/ha_archive.h:
Removed some old types
storage/blackhole/ha_blackhole.cc:
Removed some old types
storage/blackhole/ha_blackhole.h:
Removed some old types
storage/csv/ha_tina.cc:
Removed some old types
Updated hash-get-key function arguments
Changed some buffers to be uchar* to avoid casts
storage/csv/ha_tina.h:
Removed some old types
Removed some not needed casts
storage/csv/transparent_file.cc:
Removed some old types
Changed type of 'bytes_read' to be able to detect read errors
Fixed indentation
storage/csv/transparent_file.h:
Removed some old types
storage/example/ha_example.cc:
Removed some old types
Updated hash-get-key function arguments
storage/example/ha_example.h:
Removed some old types
storage/federated/ha_federated.cc:
Removed some old types
Updated hash-get-key function arguments
Removed some not needed casts
storage/federated/ha_federated.h:
Removed some old types
storage/heap/_check.c:
Changed some buffers to be uchar* to avoid casts
storage/heap/_rectest.c:
Removed some old types
storage/heap/ha_heap.cc:
Removed some old types
storage/heap/ha_heap.h:
Removed some old types
storage/heap/heapdef.h:
Removed some old types
storage/heap/hp_block.c:
Removed some old types
Changed some string lengths to use size_t
storage/heap/hp_clear.c:
Removed some old types
storage/heap/hp_close.c:
Removed some old types
storage/heap/hp_create.c:
Removed some old types
storage/heap/hp_delete.c:
Removed some old types
storage/heap/hp_hash.c:
Removed some old types
storage/heap/hp_info.c:
Removed some old types
storage/heap/hp_open.c:
Removed some old types
storage/heap/hp_rfirst.c:
Removed some old types
storage/heap/hp_rkey.c:
Removed some old types
storage/heap/hp_rlast.c:
Removed some old types
storage/heap/hp_rnext.c:
Removed some old types
storage/heap/hp_rprev.c:
Removed some old types
storage/heap/hp_rrnd.c:
Removed some old types
storage/heap/hp_rsame.c:
Removed some old types
storage/heap/hp_scan.c:
Removed some old types
storage/heap/hp_test1.c:
Removed some old types
storage/heap/hp_test2.c:
Removed some old types
storage/heap/hp_update.c:
Removed some old types
storage/heap/hp_write.c:
Removed some old types
Changed some string lengths to use size_t
storage/innobase/handler/ha_innodb.cc:
Removed some old types
Updated hash-get-key function arguments
Added missing casts for alloc() and printf()
Removed some not needed casts
storage/innobase/handler/ha_innodb.h:
Removed some old types
storage/myisam/ft_boolean_search.c:
Removed some old types
storage/myisam/ft_nlq_search.c:
Removed some old types
storage/myisam/ft_parser.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/ft_static.c:
Removed some old types
storage/myisam/ft_stopwords.c:
Removed some old types
storage/myisam/ft_update.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/ftdefs.h:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/fulltext.h:
Removed some old types
storage/myisam/ha_myisam.cc:
Removed some old types
storage/myisam/ha_myisam.h:
Removed some old types
storage/myisam/mi_cache.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/mi_check.c:
Removed some old types
storage/myisam/mi_checksum.c:
Removed some old types
storage/myisam/mi_close.c:
Removed some old types
storage/myisam/mi_create.c:
Removed some old types
storage/myisam/mi_delete.c:
Removed some old types
storage/myisam/mi_delete_all.c:
Removed some old types
storage/myisam/mi_dynrec.c:
Removed some old types
storage/myisam/mi_extra.c:
Removed some old types
storage/myisam/mi_key.c:
Removed some old types
storage/myisam/mi_locking.c:
Removed some old types
storage/myisam/mi_log.c:
Removed some old types
storage/myisam/mi_open.c:
Removed some old types
Removed some not needed casts
Check argument of my_write()/my_pwrite() in functions returning int
Added casting of string lengths to size_t
storage/myisam/mi_packrec.c:
Removed some old types
Changed some buffers to be uchar* to avoid casts
storage/myisam/mi_page.c:
Removed some old types
storage/myisam/mi_preload.c:
Removed some old types
storage/myisam/mi_range.c:
Removed some old types
storage/myisam/mi_rfirst.c:
Removed some old types
storage/myisam/mi_rkey.c:
Removed some old types
storage/myisam/mi_rlast.c:
Removed some old types
storage/myisam/mi_rnext.c:
Removed some old types
storage/myisam/mi_rnext_same.c:
Removed some old types
storage/myisam/mi_rprev.c:
Removed some old types
storage/myisam/mi_rrnd.c:
Removed some old types
storage/myisam/mi_rsame.c:
Removed some old types
storage/myisam/mi_rsamepos.c:
Removed some old types
storage/myisam/mi_scan.c:
Removed some old types
storage/myisam/mi_search.c:
Removed some old types
storage/myisam/mi_static.c:
Removed some old types
storage/myisam/mi_statrec.c:
Removed some old types
storage/myisam/mi_test1.c:
Removed some old types
storage/myisam/mi_test2.c:
Removed some old types
storage/myisam/mi_test3.c:
Removed some old types
storage/myisam/mi_unique.c:
Removed some old types
storage/myisam/mi_update.c:
Removed some old types
storage/myisam/mi_write.c:
Removed some old types
storage/myisam/myisam_ftdump.c:
Removed some old types
storage/myisam/myisamchk.c:
Removed some old types
storage/myisam/myisamdef.h:
Removed some old types
storage/myisam/myisamlog.c:
Removed some old types
Indentation fix
storage/myisam/myisampack.c:
Removed some old types
storage/myisam/rt_index.c:
Removed some old types
storage/myisam/rt_split.c:
Removed some old types
storage/myisam/sort.c:
Removed some old types
storage/myisam/sp_defs.h:
Removed some old types
storage/myisam/sp_key.c:
Removed some old types
storage/myisammrg/ha_myisammrg.cc:
Removed some old types
storage/myisammrg/ha_myisammrg.h:
Removed some old types
storage/myisammrg/myrg_close.c:
Removed some old types
storage/myisammrg/myrg_def.h:
Removed some old types
storage/myisammrg/myrg_delete.c:
Removed some old types
storage/myisammrg/myrg_open.c:
Removed some old types
Updated parameters to dirname_part()
storage/myisammrg/myrg_queue.c:
Removed some old types
storage/myisammrg/myrg_rfirst.c:
Removed some old types
storage/myisammrg/myrg_rkey.c:
Removed some old types
storage/myisammrg/myrg_rlast.c:
Removed some old types
storage/myisammrg/myrg_rnext.c:
Removed some old types
storage/myisammrg/myrg_rnext_same.c:
Removed some old types
storage/myisammrg/myrg_rprev.c:
Removed some old types
storage/myisammrg/myrg_rrnd.c:
Removed some old types
storage/myisammrg/myrg_rsame.c:
Removed some old types
storage/myisammrg/myrg_update.c:
Removed some old types
storage/myisammrg/myrg_write.c:
Removed some old types
storage/ndb/include/util/ndb_opts.h:
Removed some old types
storage/ndb/src/cw/cpcd/main.cpp:
Removed some old types
storage/ndb/src/kernel/vm/Configuration.cpp:
Removed some old types
storage/ndb/src/mgmclient/main.cpp:
Removed some old types
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Removed some old types
Removed old disabled code
storage/ndb/src/mgmsrv/main.cpp:
Removed some old types
storage/ndb/src/ndbapi/NdbBlob.cpp:
Removed some old types
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Removed not used variable
storage/ndb/src/ndbapi/NdbOperationInt.cpp:
Added required casts
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Added required casts
storage/ndb/tools/delete_all.cpp:
Removed some old types
storage/ndb/tools/desc.cpp:
Removed some old types
storage/ndb/tools/drop_index.cpp:
Removed some old types
storage/ndb/tools/drop_tab.cpp:
Removed some old types
storage/ndb/tools/listTables.cpp:
Removed some old types
storage/ndb/tools/ndb_config.cpp:
Removed some old types
storage/ndb/tools/restore/consumer_restore.cpp:
Changed some buffers to be uchar* to avoid casts with new defintion of packfrm()
storage/ndb/tools/restore/restore_main.cpp:
Removed some old types
storage/ndb/tools/select_all.cpp:
Removed some old types
storage/ndb/tools/select_count.cpp:
Removed some old types
storage/ndb/tools/waiter.cpp:
Removed some old types
strings/bchange.c:
Changed function to use uchar * and size_t
strings/bcmp.c:
Changed function to use uchar * and size_t
strings/bmove512.c:
Changed function to use uchar * and size_t
strings/bmove_upp.c:
Changed function to use uchar * and size_t
strings/ctype-big5.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-bin.c:
Changed functions to use size_t
strings/ctype-cp932.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-czech.c:
Fixed indentation
Changed functions to use size_t
strings/ctype-euc_kr.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-eucjpms.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-gb2312.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-gbk.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-latin1.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-mb.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-simple.c:
Changed functions to use size_t
Simpler loops for caseup/casedown
unsigned int -> uint
unsigned char -> uchar
strings/ctype-sjis.c:
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-tis620.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-uca.c:
Changed functions to use size_t
unsigned char -> uchar
strings/ctype-ucs2.c:
Moved inclusion of stdarg.h to other includes
usigned char -> uchar
Changed functions to use size_t
Changed character length functions to return uint
strings/ctype-ujis.c:
Changed functions to use size_t
Changed character length functions to return uint
unsigned char -> uchar
strings/ctype-utf8.c:
Changed functions to use size_t
unsigned char -> uchar
Indentation fixes
strings/ctype-win1250ch.c:
Indentation fixes
Changed functions to use size_t
strings/ctype.c:
Changed functions to use size_t
strings/decimal.c:
Changed type for memory argument to uchar *
strings/do_ctype.c:
Indentation fixes
strings/my_strtoll10.c:
unsigned char -> uchar
strings/my_vsnprintf.c:
Changed functions to use size_t
strings/r_strinstr.c:
Removed some old types
Changed functions to use size_t
strings/str_test.c:
Removed some old types
strings/strappend.c:
Changed functions to use size_t
strings/strcont.c:
Removed some old types
strings/strfill.c:
Removed some old types
strings/strinstr.c:
Changed functions to use size_t
strings/strlen.c:
Changed functions to use size_t
strings/strmake.c:
Changed functions to use size_t
strings/strnlen.c:
Changed functions to use size_t
strings/strnmov.c:
Changed functions to use size_t
strings/strto.c:
unsigned char -> uchar
strings/strtod.c:
Changed functions to use size_t
strings/strxnmov.c:
Changed functions to use size_t
strings/xml.c:
Changed functions to use size_t
Indentation fixes
tests/mysql_client_test.c:
Removed some old types
tests/thread_test.c:
Removed some old types
vio/test-ssl.c:
Removed some old types
vio/test-sslclient.c:
Removed some old types
vio/test-sslserver.c:
Removed some old types
vio/vio.c:
Removed some old types
vio/vio_priv.h:
Removed some old types
Changed vio_read()/vio_write() to work with size_t
vio/viosocket.c:
Changed vio_read()/vio_write() to work with size_t
Indentation fixes
vio/viossl.c:
Changed vio_read()/vio_write() to work with size_t
Indentation fixes
vio/viosslfactories.c:
Removed some old types
vio/viotest-ssl.c:
Removed some old types
win/README:
More explanations
946 lines
24 KiB
C
946 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
|
|
|
|
uint thr_client_alarm;
|
|
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
|
|
|
|
static sig_handler thread_alarm(int sig __attribute__((unused)));
|
|
|
|
static int compare_ulong(void *not_used __attribute__((unused)),
|
|
uchar *a_ptr,uchar* 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 (thd_lib_detected == THD_LIB_LT)
|
|
thr_client_alarm= SIGALRM;
|
|
else
|
|
thr_client_alarm= SIGUSR1;
|
|
#ifndef USE_ALARM_THREAD
|
|
if (thd_lib_detected != THD_LIB_LT)
|
|
#endif
|
|
{
|
|
my_sigset(thr_client_alarm, thread_alarm);
|
|
}
|
|
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 (thd_lib_detected == THD_LIB_LT)
|
|
{
|
|
my_sigset(thr_client_alarm, process_alarm); /* Linuxthreads */
|
|
pthread_sigmask(SIG_UNBLOCK, &s, NULL);
|
|
}
|
|
#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,(uchar*) 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*) ((uchar*) *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((uchar*) 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 (thd_lib_detected == THD_LIB_LT &&
|
|
!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;
|
|
}
|
|
|
|
/*
|
|
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,(uchar*) 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
|
|
*/
|
|
|
|
|
|
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
|
|
}
|
|
|
|
|
|
#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((uchar*) 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);
|
|
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",
|
|
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 */
|