mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
f252f9248a
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
1716 lines
51 KiB
C
1716 lines
51 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 */
|
|
|
|
/*
|
|
Read and write locks for Posix threads. All tread must acquire
|
|
all locks it needs through thr_multi_lock() to avoid dead-locks.
|
|
A lock consists of a master lock (THR_LOCK), and lock instances
|
|
(THR_LOCK_DATA).
|
|
Any thread can have any number of lock instances (read and write:s) on
|
|
any lock. All lock instances must be freed.
|
|
Locks are prioritized according to:
|
|
|
|
The current lock types are:
|
|
|
|
TL_READ # Low priority read
|
|
TL_READ_WITH_SHARED_LOCKS
|
|
TL_READ_HIGH_PRIORITY # High priority read
|
|
TL_READ_NO_INSERT # Read without concurrent inserts
|
|
TL_WRITE_ALLOW_WRITE # Write lock that allows other writers
|
|
TL_WRITE_ALLOW_READ # Write lock, but allow reading
|
|
TL_WRITE_CONCURRENT_INSERT
|
|
# Insert that can be mixed when selects
|
|
TL_WRITE_DELAYED # Used by delayed insert
|
|
# Allows lower locks to take over
|
|
TL_WRITE_LOW_PRIORITY # Low priority write
|
|
TL_WRITE # High priority write
|
|
TL_WRITE_ONLY # High priority write
|
|
# Abort all new lock request with an error
|
|
|
|
Locks are prioritized according to:
|
|
|
|
WRITE_ALLOW_WRITE, WRITE_ALLOW_READ, WRITE_CONCURRENT_INSERT, WRITE_DELAYED,
|
|
WRITE_LOW_PRIORITY, READ, WRITE, READ_HIGH_PRIORITY and WRITE_ONLY
|
|
|
|
Locks in the same privilege level are scheduled in first-in-first-out order.
|
|
|
|
To allow concurrent read/writes locks, with 'WRITE_CONCURRENT_INSERT' one
|
|
should put a pointer to the following functions in the lock structure:
|
|
(If the pointer is zero (default), the function is not called)
|
|
|
|
check_status:
|
|
Before giving a lock of type TL_WRITE_CONCURRENT_INSERT,
|
|
we check if this function exists and returns 0.
|
|
If not, then the lock is upgraded to TL_WRITE_LOCK
|
|
In MyISAM this is a simple check if the insert can be done
|
|
at the end of the datafile.
|
|
update_status:
|
|
Before a write lock is released, this function is called.
|
|
In MyISAM this functions updates the count and length of the datafile
|
|
get_status:
|
|
When one gets a lock this functions is called.
|
|
In MyISAM this stores the number of rows and size of the datafile
|
|
for concurrent reads.
|
|
|
|
The lock algorithm allows one to have one TL_WRITE_ALLOW_READ,
|
|
TL_WRITE_CONCURRENT_INSERT or one TL_WRITE_DELAYED lock at the same time as
|
|
multiple read locks.
|
|
|
|
*/
|
|
|
|
#if !defined(MAIN) && !defined(DBUG_OFF) && !defined(EXTRA_DEBUG)
|
|
#define FORCE_DBUG_OFF
|
|
#endif
|
|
|
|
#include "mysys_priv.h"
|
|
|
|
#ifdef THREAD
|
|
#include "thr_lock.h"
|
|
#include <m_string.h>
|
|
#include <errno.h>
|
|
|
|
my_bool thr_lock_inited=0;
|
|
ulong locks_immediate = 0L, locks_waited = 0L;
|
|
ulong table_lock_wait_timeout;
|
|
enum thr_lock_type thr_upgraded_concurrent_insert_lock = TL_WRITE;
|
|
|
|
/* The following constants are only for debug output */
|
|
#define MAX_THREADS 100
|
|
#define MAX_LOCKS 100
|
|
|
|
|
|
LIST *thr_lock_thread_list; /* List of threads in use */
|
|
ulong max_write_lock_count= ~(ulong) 0L;
|
|
|
|
static inline pthread_cond_t *get_cond(void)
|
|
{
|
|
return &my_thread_var->suspend;
|
|
}
|
|
|
|
/*
|
|
** For the future (now the thread specific cond is alloced by my_pthread.c)
|
|
*/
|
|
|
|
my_bool init_thr_lock()
|
|
{
|
|
thr_lock_inited=1;
|
|
return 0;
|
|
}
|
|
|
|
static inline my_bool
|
|
thr_lock_owner_equal(THR_LOCK_OWNER *rhs, THR_LOCK_OWNER *lhs)
|
|
{
|
|
return rhs == lhs;
|
|
}
|
|
|
|
|
|
#ifdef EXTRA_DEBUG
|
|
#define MAX_FOUND_ERRORS 10 /* Report 10 first errors */
|
|
static uint found_errors=0;
|
|
|
|
static int check_lock(struct st_lock_list *list, const char* lock_type,
|
|
const char *where, my_bool same_owner, bool no_cond)
|
|
{
|
|
THR_LOCK_DATA *data,**prev;
|
|
uint count=0;
|
|
THR_LOCK_OWNER *first_owner;
|
|
LINT_INIT(first_owner);
|
|
|
|
prev= &list->data;
|
|
if (list->data)
|
|
{
|
|
enum thr_lock_type last_lock_type=list->data->type;
|
|
|
|
if (same_owner && list->data)
|
|
first_owner= list->data->owner;
|
|
for (data=list->data; data && count++ < MAX_LOCKS ; data=data->next)
|
|
{
|
|
if (data->type != last_lock_type)
|
|
last_lock_type=TL_IGNORE;
|
|
if (data->prev != prev)
|
|
{
|
|
fprintf(stderr,
|
|
"Warning: prev link %d didn't point at previous lock at %s: %s\n",
|
|
count, lock_type, where);
|
|
return 1;
|
|
}
|
|
if (same_owner &&
|
|
!thr_lock_owner_equal(data->owner, first_owner) &&
|
|
last_lock_type != TL_WRITE_ALLOW_WRITE)
|
|
{
|
|
fprintf(stderr,
|
|
"Warning: Found locks from different threads in %s: %s\n",
|
|
lock_type,where);
|
|
return 1;
|
|
}
|
|
if (no_cond && data->cond)
|
|
{
|
|
fprintf(stderr,
|
|
"Warning: Found active lock with not reset cond %s: %s\n",
|
|
lock_type,where);
|
|
return 1;
|
|
}
|
|
prev= &data->next;
|
|
}
|
|
if (data)
|
|
{
|
|
fprintf(stderr,"Warning: found too many locks at %s: %s\n",
|
|
lock_type,where);
|
|
return 1;
|
|
}
|
|
}
|
|
if (prev != list->last)
|
|
{
|
|
fprintf(stderr,"Warning: last didn't point at last lock at %s: %s\n",
|
|
lock_type, where);
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void check_locks(THR_LOCK *lock, const char *where,
|
|
my_bool allow_no_locks)
|
|
{
|
|
uint old_found_errors=found_errors;
|
|
DBUG_ENTER("check_locks");
|
|
|
|
if (found_errors < MAX_FOUND_ERRORS)
|
|
{
|
|
if (check_lock(&lock->write,"write",where,1,1) |
|
|
check_lock(&lock->write_wait,"write_wait",where,0,0) |
|
|
check_lock(&lock->read,"read",where,0,1) |
|
|
check_lock(&lock->read_wait,"read_wait",where,0,0))
|
|
found_errors++;
|
|
|
|
if (found_errors < MAX_FOUND_ERRORS)
|
|
{
|
|
uint count=0;
|
|
THR_LOCK_DATA *data;
|
|
for (data=lock->read.data ; data ; data=data->next)
|
|
{
|
|
if ((int) data->type == (int) TL_READ_NO_INSERT)
|
|
count++;
|
|
/* Protect against infinite loop. */
|
|
DBUG_ASSERT(count <= lock->read_no_write_count);
|
|
}
|
|
if (count != lock->read_no_write_count)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Locks read_no_write_count was %u when it should have been %u\n", where, lock->read_no_write_count,count);
|
|
}
|
|
|
|
if (!lock->write.data)
|
|
{
|
|
if (!allow_no_locks && !lock->read.data &&
|
|
(lock->write_wait.data || lock->read_wait.data))
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': No locks in use but locks are in wait queue\n",
|
|
where);
|
|
}
|
|
if (!lock->write_wait.data)
|
|
{
|
|
if (!allow_no_locks && lock->read_wait.data)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': No write locks and waiting read locks\n",
|
|
where);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (!allow_no_locks &&
|
|
(((lock->write_wait.data->type == TL_WRITE_CONCURRENT_INSERT ||
|
|
lock->write_wait.data->type == TL_WRITE_ALLOW_WRITE) &&
|
|
!lock->read_no_write_count) ||
|
|
lock->write_wait.data->type == TL_WRITE_ALLOW_READ ||
|
|
(lock->write_wait.data->type == TL_WRITE_DELAYED &&
|
|
!lock->read.data)))
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Write lock %d waiting while no exclusive read locks\n",where,(int) lock->write_wait.data->type);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{ /* Have write lock */
|
|
if (lock->write_wait.data)
|
|
{
|
|
if (!allow_no_locks &&
|
|
lock->write.data->type == TL_WRITE_ALLOW_WRITE &&
|
|
lock->write_wait.data->type == TL_WRITE_ALLOW_WRITE)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Found WRITE_ALLOW_WRITE lock waiting for WRITE_ALLOW_WRITE lock\n",
|
|
where);
|
|
}
|
|
}
|
|
if (lock->read.data)
|
|
{
|
|
if (!thr_lock_owner_equal(lock->write.data->owner,
|
|
lock->read.data->owner) &&
|
|
((lock->write.data->type > TL_WRITE_DELAYED &&
|
|
lock->write.data->type != TL_WRITE_ONLY) ||
|
|
((lock->write.data->type == TL_WRITE_CONCURRENT_INSERT ||
|
|
lock->write.data->type == TL_WRITE_ALLOW_WRITE) &&
|
|
lock->read_no_write_count)))
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Found lock of type %d that is write and read locked\n",
|
|
where, lock->write.data->type);
|
|
DBUG_PRINT("warning",("At '%s': Found lock of type %d that is write and read locked\n",
|
|
where, lock->write.data->type));
|
|
|
|
}
|
|
}
|
|
if (lock->read_wait.data)
|
|
{
|
|
if (!allow_no_locks && lock->write.data->type <= TL_WRITE_DELAYED &&
|
|
lock->read_wait.data->type <= TL_READ_HIGH_PRIORITY)
|
|
{
|
|
found_errors++;
|
|
fprintf(stderr,
|
|
"Warning at '%s': Found read lock of type %d waiting for write lock of type %d\n",
|
|
where,
|
|
(int) lock->read_wait.data->type,
|
|
(int) lock->write.data->type);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (found_errors != old_found_errors)
|
|
{
|
|
DBUG_PRINT("error",("Found wrong lock"));
|
|
}
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
#else /* EXTRA_DEBUG */
|
|
#define check_locks(A,B,C)
|
|
#endif
|
|
|
|
|
|
/* Initialize a lock */
|
|
|
|
void thr_lock_init(THR_LOCK *lock)
|
|
{
|
|
DBUG_ENTER("thr_lock_init");
|
|
bzero((char*) lock,sizeof(*lock));
|
|
VOID(pthread_mutex_init(&lock->mutex,MY_MUTEX_INIT_FAST));
|
|
lock->read.last= &lock->read.data;
|
|
lock->read_wait.last= &lock->read_wait.data;
|
|
lock->write_wait.last= &lock->write_wait.data;
|
|
lock->write.last= &lock->write.data;
|
|
|
|
pthread_mutex_lock(&THR_LOCK_lock); /* Add to locks in use */
|
|
lock->list.data=(void*) lock;
|
|
thr_lock_thread_list=list_add(thr_lock_thread_list,&lock->list);
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void thr_lock_delete(THR_LOCK *lock)
|
|
{
|
|
DBUG_ENTER("thr_lock_delete");
|
|
VOID(pthread_mutex_destroy(&lock->mutex));
|
|
pthread_mutex_lock(&THR_LOCK_lock);
|
|
thr_lock_thread_list=list_delete(thr_lock_thread_list,&lock->list);
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
void thr_lock_info_init(THR_LOCK_INFO *info)
|
|
{
|
|
struct st_my_thread_var *tmp= my_thread_var;
|
|
info->thread= tmp->pthread_self;
|
|
info->thread_id= tmp->id;
|
|
info->n_cursors= 0;
|
|
}
|
|
|
|
/* Initialize a lock instance */
|
|
|
|
void thr_lock_data_init(THR_LOCK *lock,THR_LOCK_DATA *data, void *param)
|
|
{
|
|
data->lock=lock;
|
|
data->type=TL_UNLOCK;
|
|
data->owner= 0; /* no owner yet */
|
|
data->status_param=param;
|
|
data->cond=0;
|
|
}
|
|
|
|
|
|
static inline my_bool
|
|
have_old_read_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner)
|
|
{
|
|
for ( ; data ; data=data->next)
|
|
{
|
|
if (thr_lock_owner_equal(data->owner, owner))
|
|
return 1; /* Already locked by thread */
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static inline my_bool have_specific_lock(THR_LOCK_DATA *data,
|
|
enum thr_lock_type type)
|
|
{
|
|
for ( ; data ; data=data->next)
|
|
{
|
|
if (data->type == type)
|
|
return 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
static enum enum_thr_lock_result
|
|
wait_for_lock(struct st_lock_list *wait, THR_LOCK_DATA *data,
|
|
my_bool in_wait_list)
|
|
{
|
|
struct st_my_thread_var *thread_var= my_thread_var;
|
|
pthread_cond_t *cond= &thread_var->suspend;
|
|
struct timespec wait_timeout;
|
|
enum enum_thr_lock_result result= THR_LOCK_ABORTED;
|
|
my_bool can_deadlock= test(data->owner->info->n_cursors);
|
|
|
|
if (!in_wait_list)
|
|
{
|
|
(*wait->last)=data; /* Wait for lock */
|
|
data->prev= wait->last;
|
|
wait->last= &data->next;
|
|
}
|
|
|
|
/* Set up control struct to allow others to abort locks */
|
|
thread_var->current_mutex= &data->lock->mutex;
|
|
thread_var->current_cond= cond;
|
|
data->cond= cond;
|
|
|
|
if (can_deadlock)
|
|
set_timespec(wait_timeout, table_lock_wait_timeout);
|
|
while (!thread_var->abort || in_wait_list)
|
|
{
|
|
int rc= (can_deadlock ?
|
|
pthread_cond_timedwait(cond, &data->lock->mutex,
|
|
&wait_timeout) :
|
|
pthread_cond_wait(cond, &data->lock->mutex));
|
|
/*
|
|
We must break the wait if one of the following occurs:
|
|
- the connection has been aborted (!thread_var->abort), but
|
|
this is not a delayed insert thread (in_wait_list). For a delayed
|
|
insert thread the proper action at shutdown is, apparently, to
|
|
acquire the lock and complete the insert.
|
|
- the lock has been granted (data->cond is set to NULL by the granter),
|
|
or the waiting has been aborted (additionally data->type is set to
|
|
TL_UNLOCK).
|
|
- the wait has timed out (rc == ETIMEDOUT)
|
|
Order of checks below is important to not report about timeout
|
|
if the predicate is true.
|
|
*/
|
|
if (data->cond == 0)
|
|
break;
|
|
if (rc == ETIMEDOUT || rc == ETIME)
|
|
{
|
|
result= THR_LOCK_WAIT_TIMEOUT;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (data->cond || data->type == TL_UNLOCK)
|
|
{
|
|
if (data->cond) /* aborted or timed out */
|
|
{
|
|
if (((*data->prev)=data->next)) /* remove from wait-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
wait->last=data->prev;
|
|
data->type= TL_UNLOCK; /* No lock */
|
|
}
|
|
check_locks(data->lock,"failed wait_for_lock",0);
|
|
}
|
|
else
|
|
{
|
|
result= THR_LOCK_SUCCESS;
|
|
statistic_increment(locks_waited, &THR_LOCK_lock);
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, 0);
|
|
check_locks(data->lock,"got wait_for_lock",0);
|
|
}
|
|
pthread_mutex_unlock(&data->lock->mutex);
|
|
|
|
/* The following must be done after unlock of lock->mutex */
|
|
pthread_mutex_lock(&thread_var->mutex);
|
|
thread_var->current_mutex= 0;
|
|
thread_var->current_cond= 0;
|
|
pthread_mutex_unlock(&thread_var->mutex);
|
|
return result;
|
|
}
|
|
|
|
|
|
enum enum_thr_lock_result
|
|
thr_lock(THR_LOCK_DATA *data, THR_LOCK_OWNER *owner,
|
|
enum thr_lock_type lock_type)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
enum enum_thr_lock_result result= THR_LOCK_SUCCESS;
|
|
struct st_lock_list *wait_queue;
|
|
THR_LOCK_DATA *lock_owner;
|
|
DBUG_ENTER("thr_lock");
|
|
|
|
data->next=0;
|
|
data->cond=0; /* safety */
|
|
data->type=lock_type;
|
|
data->owner= owner; /* Must be reset ! */
|
|
VOID(pthread_mutex_lock(&lock->mutex));
|
|
DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx type: %d",
|
|
(long) data, data->owner->info->thread_id,
|
|
(long) lock, (int) lock_type));
|
|
check_locks(lock,(uint) lock_type <= (uint) TL_READ_NO_INSERT ?
|
|
"enter read_lock" : "enter write_lock",0);
|
|
if ((int) lock_type <= (int) TL_READ_NO_INSERT)
|
|
{
|
|
/* Request for READ lock */
|
|
if (lock->write.data)
|
|
{
|
|
/* We can allow a read lock even if there is already a write lock
|
|
on the table in one the following cases:
|
|
- This thread alread have a write lock on the table
|
|
- The write lock is TL_WRITE_ALLOW_READ or TL_WRITE_DELAYED
|
|
and the read lock is TL_READ_HIGH_PRIORITY or TL_READ
|
|
- The write lock is TL_WRITE_CONCURRENT_INSERT or TL_WRITE_ALLOW_WRITE
|
|
and the read lock is not TL_READ_NO_INSERT
|
|
*/
|
|
|
|
DBUG_PRINT("lock",("write locked by thread: 0x%lx",
|
|
lock->write.data->owner->info->thread_id));
|
|
if (thr_lock_owner_equal(data->owner, lock->write.data->owner) ||
|
|
(lock->write.data->type <= TL_WRITE_DELAYED &&
|
|
(((int) lock_type <= (int) TL_READ_HIGH_PRIORITY) ||
|
|
(lock->write.data->type != TL_WRITE_CONCURRENT_INSERT &&
|
|
lock->write.data->type != TL_WRITE_ALLOW_READ))))
|
|
{ /* Already got a write lock */
|
|
(*lock->read.last)=data; /* Add to running FIFO */
|
|
data->prev=lock->read.last;
|
|
lock->read.last= &data->next;
|
|
if (lock_type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count++;
|
|
check_locks(lock,"read lock with old write lock",0);
|
|
if (lock->get_status)
|
|
(*lock->get_status)(data->status_param, 0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
if (lock->write.data->type == TL_WRITE_ONLY)
|
|
{
|
|
/* We are not allowed to get a READ lock in this case */
|
|
data->type=TL_UNLOCK;
|
|
result= THR_LOCK_ABORTED; /* Can't wait for this one */
|
|
goto end;
|
|
}
|
|
}
|
|
else if (!lock->write_wait.data ||
|
|
lock->write_wait.data->type <= TL_WRITE_LOW_PRIORITY ||
|
|
lock_type == TL_READ_HIGH_PRIORITY ||
|
|
have_old_read_lock(lock->read.data, data->owner))
|
|
{ /* No important write-locks */
|
|
(*lock->read.last)=data; /* Add to running FIFO */
|
|
data->prev=lock->read.last;
|
|
lock->read.last= &data->next;
|
|
if (lock->get_status)
|
|
(*lock->get_status)(data->status_param, 0);
|
|
if (lock_type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count++;
|
|
check_locks(lock,"read lock with no write locks",0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
/*
|
|
We're here if there is an active write lock or no write
|
|
lock but a high priority write waiting in the write_wait queue.
|
|
In the latter case we should yield the lock to the writer.
|
|
*/
|
|
wait_queue= &lock->read_wait;
|
|
}
|
|
else /* Request for WRITE lock */
|
|
{
|
|
if (lock_type == TL_WRITE_DELAYED)
|
|
{
|
|
if (lock->write.data && lock->write.data->type == TL_WRITE_ONLY)
|
|
{
|
|
data->type=TL_UNLOCK;
|
|
result= THR_LOCK_ABORTED; /* Can't wait for this one */
|
|
goto end;
|
|
}
|
|
/*
|
|
if there is a TL_WRITE_ALLOW_READ lock, we have to wait for a lock
|
|
(TL_WRITE_ALLOW_READ is used for ALTER TABLE in MySQL)
|
|
*/
|
|
if ((!lock->write.data ||
|
|
lock->write.data->type != TL_WRITE_ALLOW_READ) &&
|
|
!have_specific_lock(lock->write_wait.data,TL_WRITE_ALLOW_READ) &&
|
|
(lock->write.data || lock->read.data))
|
|
{
|
|
/* Add delayed write lock to write_wait queue, and return at once */
|
|
(*lock->write_wait.last)=data;
|
|
data->prev=lock->write_wait.last;
|
|
lock->write_wait.last= &data->next;
|
|
data->cond=get_cond();
|
|
/*
|
|
We don't have to do get_status here as we will do it when we change
|
|
the delayed lock to a real write lock
|
|
*/
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
}
|
|
else if (lock_type == TL_WRITE_CONCURRENT_INSERT && ! lock->check_status)
|
|
data->type=lock_type= thr_upgraded_concurrent_insert_lock;
|
|
|
|
if (lock->write.data) /* If there is a write lock */
|
|
{
|
|
if (lock->write.data->type == TL_WRITE_ONLY)
|
|
{
|
|
/* We are not allowed to get a lock in this case */
|
|
data->type=TL_UNLOCK;
|
|
result= THR_LOCK_ABORTED; /* Can't wait for this one */
|
|
goto end;
|
|
}
|
|
|
|
/*
|
|
The following test will not work if the old lock was a
|
|
TL_WRITE_ALLOW_WRITE, TL_WRITE_ALLOW_READ or TL_WRITE_DELAYED in
|
|
the same thread, but this will never happen within MySQL.
|
|
*/
|
|
if (thr_lock_owner_equal(data->owner, lock->write.data->owner) ||
|
|
(lock_type == TL_WRITE_ALLOW_WRITE &&
|
|
!lock->write_wait.data &&
|
|
lock->write.data->type == TL_WRITE_ALLOW_WRITE))
|
|
{
|
|
/*
|
|
We have already got a write lock or all locks are
|
|
TL_WRITE_ALLOW_WRITE
|
|
*/
|
|
DBUG_PRINT("info", ("write_wait.data: 0x%lx old_type: %d",
|
|
(ulong) lock->write_wait.data,
|
|
lock->write.data->type));
|
|
|
|
(*lock->write.last)=data; /* Add to running fifo */
|
|
data->prev=lock->write.last;
|
|
lock->write.last= &data->next;
|
|
check_locks(lock,"second write lock",0);
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, 0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
/* purecov: begin inspected */
|
|
DBUG_PRINT("lock",("write locked by thread: 0x%lx",
|
|
lock->write.data->owner->info->thread_id));
|
|
/* purecov: end */
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("info", ("write_wait.data: 0x%lx",
|
|
(ulong) lock->write_wait.data));
|
|
if (!lock->write_wait.data)
|
|
{ /* no scheduled write locks */
|
|
my_bool concurrent_insert= 0;
|
|
if (lock_type == TL_WRITE_CONCURRENT_INSERT)
|
|
{
|
|
concurrent_insert= 1;
|
|
if ((*lock->check_status)(data->status_param))
|
|
{
|
|
concurrent_insert= 0;
|
|
data->type=lock_type= thr_upgraded_concurrent_insert_lock;
|
|
}
|
|
}
|
|
|
|
if (!lock->read.data ||
|
|
(lock_type <= TL_WRITE_DELAYED &&
|
|
((lock_type != TL_WRITE_CONCURRENT_INSERT &&
|
|
lock_type != TL_WRITE_ALLOW_WRITE) ||
|
|
!lock->read_no_write_count)))
|
|
{
|
|
(*lock->write.last)=data; /* Add as current write lock */
|
|
data->prev=lock->write.last;
|
|
lock->write.last= &data->next;
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, concurrent_insert);
|
|
check_locks(lock,"only write lock",0);
|
|
statistic_increment(locks_immediate,&THR_LOCK_lock);
|
|
goto end;
|
|
}
|
|
}
|
|
DBUG_PRINT("lock",("write locked by thread: 0x%lx type: %d",
|
|
lock->read.data->owner->info->thread_id, data->type));
|
|
}
|
|
wait_queue= &lock->write_wait;
|
|
}
|
|
/*
|
|
Try to detect a trivial deadlock when using cursors: attempt to
|
|
lock a table that is already locked by an open cursor within the
|
|
same connection. lock_owner can be zero if we succumbed to a high
|
|
priority writer in the write_wait queue.
|
|
*/
|
|
lock_owner= lock->read.data ? lock->read.data : lock->write.data;
|
|
if (lock_owner && lock_owner->owner->info == owner->info)
|
|
{
|
|
result= THR_LOCK_DEADLOCK;
|
|
goto end;
|
|
}
|
|
/* Can't get lock yet; Wait for it */
|
|
DBUG_RETURN(wait_for_lock(wait_queue, data, 0));
|
|
end:
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(result);
|
|
}
|
|
|
|
|
|
static inline void free_all_read_locks(THR_LOCK *lock,
|
|
bool using_concurrent_insert)
|
|
{
|
|
THR_LOCK_DATA *data=lock->read_wait.data;
|
|
|
|
check_locks(lock,"before freeing read locks",1);
|
|
|
|
/* move all locks from read_wait list to read list */
|
|
(*lock->read.last)=data;
|
|
data->prev=lock->read.last;
|
|
lock->read.last=lock->read_wait.last;
|
|
|
|
/* Clear read_wait list */
|
|
lock->read_wait.last= &lock->read_wait.data;
|
|
|
|
do
|
|
{
|
|
pthread_cond_t *cond=data->cond;
|
|
if ((int) data->type == (int) TL_READ_NO_INSERT)
|
|
{
|
|
if (using_concurrent_insert)
|
|
{
|
|
/*
|
|
We can't free this lock;
|
|
Link lock away from read chain back into read_wait chain
|
|
*/
|
|
if (((*data->prev)=data->next))
|
|
data->next->prev=data->prev;
|
|
else
|
|
lock->read.last=data->prev;
|
|
*lock->read_wait.last= data;
|
|
data->prev= lock->read_wait.last;
|
|
lock->read_wait.last= &data->next;
|
|
continue;
|
|
}
|
|
lock->read_no_write_count++;
|
|
}
|
|
/* purecov: begin inspected */
|
|
DBUG_PRINT("lock",("giving read lock to thread: 0x%lx",
|
|
data->owner->info->thread_id));
|
|
/* purecov: end */
|
|
data->cond=0; /* Mark thread free */
|
|
VOID(pthread_cond_signal(cond));
|
|
} while ((data=data->next));
|
|
*lock->read_wait.last=0;
|
|
if (!lock->read_wait.data)
|
|
lock->write_lock_count=0;
|
|
check_locks(lock,"after giving read locks",0);
|
|
}
|
|
|
|
/* Unlock lock and free next thread on same lock */
|
|
|
|
void thr_unlock(THR_LOCK_DATA *data)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
enum thr_lock_type lock_type=data->type;
|
|
DBUG_ENTER("thr_unlock");
|
|
DBUG_PRINT("lock",("data: 0x%lx thread: 0x%lx lock: 0x%lx",
|
|
(long) data, data->owner->info->thread_id, (long) lock));
|
|
pthread_mutex_lock(&lock->mutex);
|
|
check_locks(lock,"start of release lock",0);
|
|
|
|
if (((*data->prev)=data->next)) /* remove from lock-list */
|
|
data->next->prev= data->prev;
|
|
else if (lock_type <= TL_READ_NO_INSERT)
|
|
lock->read.last=data->prev;
|
|
else if (lock_type == TL_WRITE_DELAYED && data->cond)
|
|
{
|
|
/*
|
|
This only happens in extreme circumstances when a
|
|
write delayed lock that is waiting for a lock
|
|
*/
|
|
lock->write_wait.last=data->prev; /* Put it on wait queue */
|
|
}
|
|
else
|
|
lock->write.last=data->prev;
|
|
if (lock_type >= TL_WRITE_CONCURRENT_INSERT)
|
|
{
|
|
if (lock->update_status)
|
|
(*lock->update_status)(data->status_param);
|
|
}
|
|
else
|
|
{
|
|
if (lock->restore_status)
|
|
(*lock->restore_status)(data->status_param);
|
|
}
|
|
if (lock_type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count--;
|
|
data->type=TL_UNLOCK; /* Mark unlocked */
|
|
check_locks(lock,"after releasing lock",1);
|
|
|
|
if (!lock->write.data) /* If no active write locks */
|
|
{
|
|
data=lock->write_wait.data;
|
|
if (!lock->read.data) /* If no more locks in use */
|
|
{
|
|
/* Release write-locks with TL_WRITE or TL_WRITE_ONLY priority first */
|
|
if (data &&
|
|
(data->type != TL_WRITE_LOW_PRIORITY || !lock->read_wait.data ||
|
|
lock->read_wait.data->type < TL_READ_HIGH_PRIORITY))
|
|
{
|
|
if (lock->write_lock_count++ > max_write_lock_count)
|
|
{
|
|
/* Too many write locks in a row; Release all waiting read locks */
|
|
lock->write_lock_count=0;
|
|
if (lock->read_wait.data)
|
|
{
|
|
DBUG_PRINT("info",("Freeing all read_locks because of max_write_lock_count"));
|
|
free_all_read_locks(lock,0);
|
|
goto end;
|
|
}
|
|
}
|
|
for (;;)
|
|
{
|
|
if (((*data->prev)=data->next)) /* remove from wait-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last=data->prev;
|
|
(*lock->write.last)=data; /* Put in execute list */
|
|
data->prev=lock->write.last;
|
|
data->next=0;
|
|
lock->write.last= &data->next;
|
|
if (data->type == TL_WRITE_CONCURRENT_INSERT &&
|
|
(*lock->check_status)(data->status_param))
|
|
data->type=TL_WRITE; /* Upgrade lock */
|
|
/* purecov: begin inspected */
|
|
DBUG_PRINT("lock",("giving write lock of type %d to thread: 0x%lx",
|
|
data->type, data->owner->info->thread_id));
|
|
/* purecov: end */
|
|
{
|
|
pthread_cond_t *cond=data->cond;
|
|
data->cond=0; /* Mark thread free */
|
|
VOID(pthread_cond_signal(cond)); /* Start waiting thread */
|
|
}
|
|
if (data->type != TL_WRITE_ALLOW_WRITE ||
|
|
!lock->write_wait.data ||
|
|
lock->write_wait.data->type != TL_WRITE_ALLOW_WRITE)
|
|
break;
|
|
data=lock->write_wait.data; /* Free this too */
|
|
}
|
|
if (data->type >= TL_WRITE_LOW_PRIORITY)
|
|
{
|
|
check_locks(lock,"giving write lock",0);
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
/* Release possible read locks together with the write lock */
|
|
}
|
|
if (lock->read_wait.data)
|
|
free_all_read_locks(lock,
|
|
data &&
|
|
(data->type == TL_WRITE_CONCURRENT_INSERT ||
|
|
data->type == TL_WRITE_ALLOW_WRITE));
|
|
else
|
|
{
|
|
DBUG_PRINT("lock",("No waiting read locks to free"));
|
|
}
|
|
}
|
|
else if (data &&
|
|
(lock_type=data->type) <= TL_WRITE_DELAYED &&
|
|
((lock_type != TL_WRITE_CONCURRENT_INSERT &&
|
|
lock_type != TL_WRITE_ALLOW_WRITE) ||
|
|
!lock->read_no_write_count))
|
|
{
|
|
/*
|
|
For DELAYED, ALLOW_READ, WRITE_ALLOW_WRITE or CONCURRENT_INSERT locks
|
|
start WRITE locks together with the READ locks
|
|
*/
|
|
if (lock_type == TL_WRITE_CONCURRENT_INSERT &&
|
|
(*lock->check_status)(data->status_param))
|
|
{
|
|
data->type=TL_WRITE; /* Upgrade lock */
|
|
if (lock->read_wait.data)
|
|
free_all_read_locks(lock,0);
|
|
goto end;
|
|
}
|
|
do {
|
|
pthread_cond_t *cond=data->cond;
|
|
if (((*data->prev)=data->next)) /* remove from wait-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last=data->prev;
|
|
(*lock->write.last)=data; /* Put in execute list */
|
|
data->prev=lock->write.last;
|
|
lock->write.last= &data->next;
|
|
data->next=0; /* Only one write lock */
|
|
data->cond=0; /* Mark thread free */
|
|
VOID(pthread_cond_signal(cond)); /* Start waiting thread */
|
|
} while (lock_type == TL_WRITE_ALLOW_WRITE &&
|
|
(data=lock->write_wait.data) &&
|
|
data->type == TL_WRITE_ALLOW_WRITE);
|
|
if (lock->read_wait.data)
|
|
free_all_read_locks(lock,
|
|
(lock_type == TL_WRITE_CONCURRENT_INSERT ||
|
|
lock_type == TL_WRITE_ALLOW_WRITE));
|
|
}
|
|
else if (!data && lock->read_wait.data)
|
|
free_all_read_locks(lock,0);
|
|
}
|
|
end:
|
|
check_locks(lock,"thr_unlock",0);
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
** Get all locks in a specific order to avoid dead-locks
|
|
** Sort acording to lock position and put write_locks before read_locks if
|
|
** lock on same lock.
|
|
*/
|
|
|
|
|
|
#define LOCK_CMP(A,B) ((uchar*) (A->lock) - (uint) ((A)->type) < (uchar*) (B->lock)- (uint) ((B)->type))
|
|
|
|
static void sort_locks(THR_LOCK_DATA **data,uint count)
|
|
{
|
|
THR_LOCK_DATA **pos,**end,**prev,*tmp;
|
|
|
|
/* Sort locks with insertion sort (fast because almost always few locks) */
|
|
|
|
for (pos=data+1,end=data+count; pos < end ; pos++)
|
|
{
|
|
tmp= *pos;
|
|
if (LOCK_CMP(tmp,pos[-1]))
|
|
{
|
|
prev=pos;
|
|
do {
|
|
prev[0]=prev[-1];
|
|
} while (--prev != data && LOCK_CMP(tmp,prev[-1]));
|
|
prev[0]=tmp;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
enum enum_thr_lock_result
|
|
thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_OWNER *owner)
|
|
{
|
|
THR_LOCK_DATA **pos,**end;
|
|
DBUG_ENTER("thr_multi_lock");
|
|
DBUG_PRINT("lock",("data: 0x%lx count: %d", (long) data, count));
|
|
if (count > 1)
|
|
sort_locks(data,count);
|
|
/* lock everything */
|
|
for (pos=data,end=data+count; pos < end ; pos++)
|
|
{
|
|
enum enum_thr_lock_result result= thr_lock(*pos, owner, (*pos)->type);
|
|
if (result != THR_LOCK_SUCCESS)
|
|
{ /* Aborted */
|
|
thr_multi_unlock(data,(uint) (pos-data));
|
|
DBUG_RETURN(result);
|
|
}
|
|
#ifdef MAIN
|
|
printf("Thread: %s Got lock: 0x%lx type: %d\n",my_thread_name(),
|
|
(long) pos[0]->lock, pos[0]->type); fflush(stdout);
|
|
#endif
|
|
}
|
|
/*
|
|
Ensure that all get_locks() have the same status
|
|
If we lock the same table multiple times, we must use the same
|
|
status_param!
|
|
*/
|
|
#if !defined(DONT_USE_RW_LOCKS)
|
|
if (count > 1)
|
|
{
|
|
THR_LOCK_DATA *last_lock= end[-1];
|
|
pos=end-1;
|
|
do
|
|
{
|
|
pos--;
|
|
if (last_lock->lock == (*pos)->lock &&
|
|
last_lock->lock->copy_status)
|
|
{
|
|
if (last_lock->type <= TL_READ_NO_INSERT)
|
|
{
|
|
THR_LOCK_DATA **read_lock;
|
|
/*
|
|
If we are locking the same table with read locks we must ensure
|
|
that all tables share the status of the last write lock or
|
|
the same read lock.
|
|
*/
|
|
for (;
|
|
(*pos)->type <= TL_READ_NO_INSERT &&
|
|
pos != data &&
|
|
pos[-1]->lock == (*pos)->lock ;
|
|
pos--) ;
|
|
|
|
read_lock = pos+1;
|
|
do
|
|
{
|
|
(last_lock->lock->copy_status)((*read_lock)->status_param,
|
|
(*pos)->status_param);
|
|
} while (*(read_lock++) != last_lock);
|
|
last_lock= (*pos); /* Point at last write lock */
|
|
}
|
|
else
|
|
(*last_lock->lock->copy_status)((*pos)->status_param,
|
|
last_lock->status_param);
|
|
}
|
|
else
|
|
last_lock=(*pos);
|
|
} while (pos != data);
|
|
}
|
|
#endif
|
|
DBUG_RETURN(THR_LOCK_SUCCESS);
|
|
}
|
|
|
|
/* free all locks */
|
|
|
|
void thr_multi_unlock(THR_LOCK_DATA **data,uint count)
|
|
{
|
|
THR_LOCK_DATA **pos,**end;
|
|
DBUG_ENTER("thr_multi_unlock");
|
|
DBUG_PRINT("lock",("data: 0x%lx count: %d", (long) data, count));
|
|
|
|
for (pos=data,end=data+count; pos < end ; pos++)
|
|
{
|
|
#ifdef MAIN
|
|
printf("Thread: %s Rel lock: 0x%lx type: %d\n",
|
|
my_thread_name(), (long) pos[0]->lock, pos[0]->type);
|
|
fflush(stdout);
|
|
#endif
|
|
if ((*pos)->type != TL_UNLOCK)
|
|
thr_unlock(*pos);
|
|
else
|
|
{
|
|
DBUG_PRINT("lock",("Free lock: data: 0x%lx thread: 0x%lx lock: 0x%lx",
|
|
(long) *pos, (*pos)->owner->info->thread_id,
|
|
(long) (*pos)->lock));
|
|
}
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
Abort all threads waiting for a lock. The lock will be upgraded to
|
|
TL_WRITE_ONLY to abort any new accesses to the lock
|
|
*/
|
|
|
|
void thr_abort_locks(THR_LOCK *lock, bool upgrade_lock)
|
|
{
|
|
THR_LOCK_DATA *data;
|
|
DBUG_ENTER("thr_abort_locks");
|
|
pthread_mutex_lock(&lock->mutex);
|
|
|
|
for (data=lock->read_wait.data; data ; data=data->next)
|
|
{
|
|
data->type=TL_UNLOCK; /* Mark killed */
|
|
/* It's safe to signal the cond first: we're still holding the mutex. */
|
|
pthread_cond_signal(data->cond);
|
|
data->cond=0; /* Removed from list */
|
|
}
|
|
for (data=lock->write_wait.data; data ; data=data->next)
|
|
{
|
|
data->type=TL_UNLOCK;
|
|
pthread_cond_signal(data->cond);
|
|
data->cond=0;
|
|
}
|
|
lock->read_wait.last= &lock->read_wait.data;
|
|
lock->write_wait.last= &lock->write_wait.data;
|
|
lock->read_wait.data=lock->write_wait.data=0;
|
|
if (upgrade_lock && lock->write.data)
|
|
lock->write.data->type=TL_WRITE_ONLY;
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
/*
|
|
Abort all locks for specific table/thread combination
|
|
|
|
This is used to abort all locks for a specific thread
|
|
*/
|
|
|
|
my_bool thr_abort_locks_for_thread(THR_LOCK *lock, my_thread_id thread_id)
|
|
{
|
|
THR_LOCK_DATA *data;
|
|
my_bool found= FALSE;
|
|
DBUG_ENTER("thr_abort_locks_for_thread");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
for (data= lock->read_wait.data; data ; data= data->next)
|
|
{
|
|
if (data->owner->info->thread_id == thread_id) /* purecov: tested */
|
|
{
|
|
DBUG_PRINT("info",("Aborting read-wait lock"));
|
|
data->type= TL_UNLOCK; /* Mark killed */
|
|
/* It's safe to signal the cond first: we're still holding the mutex. */
|
|
found= TRUE;
|
|
pthread_cond_signal(data->cond);
|
|
data->cond= 0; /* Removed from list */
|
|
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->read_wait.last= data->prev;
|
|
}
|
|
}
|
|
for (data= lock->write_wait.data; data ; data= data->next)
|
|
{
|
|
if (data->owner->info->thread_id == thread_id) /* purecov: tested */
|
|
{
|
|
DBUG_PRINT("info",("Aborting write-wait lock"));
|
|
data->type= TL_UNLOCK;
|
|
found= TRUE;
|
|
pthread_cond_signal(data->cond);
|
|
data->cond= 0;
|
|
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last= data->prev;
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(found);
|
|
}
|
|
|
|
|
|
/*
|
|
Downgrade a WRITE_* to a lower WRITE level
|
|
SYNOPSIS
|
|
thr_downgrade_write_lock()
|
|
in_data Lock data of thread downgrading its lock
|
|
new_lock_type New write lock type
|
|
RETURN VALUE
|
|
NONE
|
|
DESCRIPTION
|
|
This can be used to downgrade a lock already owned. When the downgrade
|
|
occurs also other waiters, both readers and writers can be allowed to
|
|
start.
|
|
The previous lock is often TL_WRITE_ONLY but can also be
|
|
TL_WRITE and TL_WRITE_ALLOW_READ. The normal downgrade variants are
|
|
TL_WRITE_ONLY => TL_WRITE_ALLOW_READ After a short exclusive lock
|
|
TL_WRITE_ALLOW_READ => TL_WRITE_ALLOW_WRITE After discovering that the
|
|
operation didn't need such a high lock.
|
|
TL_WRITE_ONLY => TL_WRITE after a short exclusive lock while holding a
|
|
write table lock
|
|
TL_WRITE_ONLY => TL_WRITE_ALLOW_WRITE After a short exclusive lock after
|
|
already earlier having dongraded lock to TL_WRITE_ALLOW_WRITE
|
|
The implementation is conservative and rather don't start rather than
|
|
go on unknown paths to start, the common cases are handled.
|
|
|
|
NOTE:
|
|
In its current implementation it is only allowed to downgrade from
|
|
TL_WRITE_ONLY. In this case there are no waiters. Thus no wake up
|
|
logic is required.
|
|
*/
|
|
|
|
void thr_downgrade_write_lock(THR_LOCK_DATA *in_data,
|
|
enum thr_lock_type new_lock_type)
|
|
{
|
|
THR_LOCK *lock=in_data->lock;
|
|
#ifndef DBUG_OFF
|
|
enum thr_lock_type old_lock_type= in_data->type;
|
|
#endif
|
|
#ifdef TO_BE_REMOVED
|
|
THR_LOCK_DATA *data, *next;
|
|
bool start_writers= FALSE;
|
|
bool start_readers= FALSE;
|
|
#endif
|
|
DBUG_ENTER("thr_downgrade_write_only_lock");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
DBUG_ASSERT(old_lock_type == TL_WRITE_ONLY);
|
|
DBUG_ASSERT(old_lock_type > new_lock_type);
|
|
in_data->type= new_lock_type;
|
|
check_locks(lock,"after downgrading lock",0);
|
|
|
|
#if TO_BE_REMOVED
|
|
switch (old_lock_type)
|
|
{
|
|
case TL_WRITE_ONLY:
|
|
case TL_WRITE:
|
|
case TL_WRITE_LOW_PRIORITY:
|
|
/*
|
|
Previous lock was exclusive we are now ready to start up most waiting
|
|
threads.
|
|
*/
|
|
switch (new_lock_type)
|
|
{
|
|
case TL_WRITE_ALLOW_READ:
|
|
/* Still cannot start WRITE operations. Can only start readers. */
|
|
start_readers= TRUE;
|
|
break;
|
|
case TL_WRITE:
|
|
case TL_WRITE_LOW_PRIORITY:
|
|
/*
|
|
Still cannot start anything, but new requests are no longer
|
|
aborted.
|
|
*/
|
|
break;
|
|
case TL_WRITE_ALLOW_WRITE:
|
|
/*
|
|
We can start both writers and readers.
|
|
*/
|
|
start_writers= TRUE;
|
|
start_readers= TRUE;
|
|
break;
|
|
case TL_WRITE_CONCURRENT_INSERT:
|
|
case TL_WRITE_DELAYED:
|
|
/*
|
|
This routine is not designed for those. Lock will be downgraded
|
|
but no start of waiters will occur. This is not the optimal but
|
|
should be a correct behaviour.
|
|
*/
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
}
|
|
break;
|
|
case TL_WRITE_DELAYED:
|
|
case TL_WRITE_CONCURRENT_INSERT:
|
|
/*
|
|
This routine is not designed for those. Lock will be downgraded
|
|
but no start of waiters will occur. This is not the optimal but
|
|
should be a correct behaviour.
|
|
*/
|
|
break;
|
|
case TL_WRITE_ALLOW_READ:
|
|
DBUG_ASSERT(new_lock_type == TL_WRITE_ALLOW_WRITE);
|
|
/*
|
|
Previously writers were not allowed to start, now it is ok to
|
|
start them again. Readers are already allowed so no reason to
|
|
handle them.
|
|
*/
|
|
start_writers= TRUE;
|
|
break;
|
|
default:
|
|
DBUG_ASSERT(0);
|
|
break;
|
|
}
|
|
if (start_writers)
|
|
{
|
|
/*
|
|
At this time the only active writer can be ourselves. Thus we need
|
|
not worry about that there are other concurrent write operations
|
|
active on the table. Thus we only need to worry about starting
|
|
waiting operations.
|
|
We also only come here with TL_WRITE_ALLOW_WRITE as the new
|
|
lock type, thus we can start other writers also of the same type.
|
|
If we find a lock at exclusive level >= TL_WRITE_LOW_PRIORITY we
|
|
don't start any more operations that would be mean those operations
|
|
will have to wait for things started afterwards.
|
|
*/
|
|
DBUG_ASSERT(new_lock_type == TL_WRITE_ALLOW_WRITE);
|
|
for (data=lock->write_wait.data; data ; data= next)
|
|
{
|
|
/*
|
|
All WRITE requests compatible with new lock type are also
|
|
started
|
|
*/
|
|
next= data->next;
|
|
if (start_writers && data->type == new_lock_type)
|
|
{
|
|
pthread_cond_t *cond= data->cond;
|
|
/*
|
|
It is ok to start this waiter.
|
|
Move from being first in wait queue to be last in write queue.
|
|
*/
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write_wait.last= data->prev;
|
|
data->prev= lock->write.last;
|
|
lock->write.last= &data->next;
|
|
data->next= 0;
|
|
check_locks(lock, "Started write lock after downgrade",0);
|
|
data->cond= 0;
|
|
pthread_cond_signal(cond);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
We found an incompatible lock, we won't start any more write
|
|
requests to avoid letting writers pass other writers in the
|
|
queue.
|
|
*/
|
|
start_writers= FALSE;
|
|
if (data->type >= TL_WRITE_LOW_PRIORITY)
|
|
{
|
|
/*
|
|
We have an exclusive writer in the queue so we won't start
|
|
readers either.
|
|
*/
|
|
start_readers= FALSE;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (start_readers)
|
|
{
|
|
DBUG_ASSERT(new_lock_type == TL_WRITE_ALLOW_WRITE ||
|
|
new_lock_type == TL_WRITE_ALLOW_READ);
|
|
/*
|
|
When we come here we know that the write locks are
|
|
TL_WRITE_ALLOW_WRITE or TL_WRITE_ALLOW_READ. This means that reads
|
|
are ok
|
|
*/
|
|
for (data=lock->read_wait.data; data ; data=next)
|
|
{
|
|
next= data->next;
|
|
/*
|
|
All reads are ok to start now except TL_READ_NO_INSERT when
|
|
write lock is TL_WRITE_ALLOW_READ.
|
|
*/
|
|
if (new_lock_type != TL_WRITE_ALLOW_READ ||
|
|
data->type != TL_READ_NO_INSERT)
|
|
{
|
|
pthread_cond_t *cond= data->cond;
|
|
if (((*data->prev)= data->next))
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->read_wait.last= data->prev;
|
|
data->prev= lock->read.last;
|
|
lock->read.last= &data->next;
|
|
data->next= 0;
|
|
|
|
if (data->type == TL_READ_NO_INSERT)
|
|
lock->read_no_write_count++;
|
|
check_locks(lock, "Started read lock after downgrade",0);
|
|
data->cond= 0;
|
|
pthread_cond_signal(cond);
|
|
}
|
|
}
|
|
}
|
|
check_locks(lock,"after starting waiters after downgrading lock",0);
|
|
#endif
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/* Upgrade a WRITE_DELAY lock to a WRITE_LOCK */
|
|
|
|
my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
DBUG_ENTER("thr_upgrade_write_delay_lock");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
if (data->type == TL_UNLOCK || data->type >= TL_WRITE_LOW_PRIORITY)
|
|
{
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(data->type == TL_UNLOCK); /* Test if Aborted */
|
|
}
|
|
check_locks(lock,"before upgrading lock",0);
|
|
/* TODO: Upgrade to TL_WRITE_CONCURRENT_INSERT in some cases */
|
|
data->type=TL_WRITE; /* Upgrade lock */
|
|
|
|
/* Check if someone has given us the lock */
|
|
if (!data->cond)
|
|
{
|
|
if (!lock->read.data) /* No read locks */
|
|
{ /* We have the lock */
|
|
if (data->lock->get_status)
|
|
(*data->lock->get_status)(data->status_param, 0);
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
if (((*data->prev)=data->next)) /* remove from lock-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write.last=data->prev;
|
|
|
|
if ((data->next=lock->write_wait.data)) /* Put first in lock_list */
|
|
data->next->prev= &data->next;
|
|
else
|
|
lock->write_wait.last= &data->next;
|
|
data->prev= &lock->write_wait.data;
|
|
lock->write_wait.data=data;
|
|
check_locks(lock,"upgrading lock",0);
|
|
}
|
|
else
|
|
{
|
|
check_locks(lock,"waiting for lock",0);
|
|
}
|
|
DBUG_RETURN(wait_for_lock(&lock->write_wait,data,1));
|
|
}
|
|
|
|
|
|
/* downgrade a WRITE lock to a WRITE_DELAY lock if there is pending locks */
|
|
|
|
my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data)
|
|
{
|
|
THR_LOCK *lock=data->lock;
|
|
DBUG_ENTER("thr_reschedule_write_lock");
|
|
|
|
pthread_mutex_lock(&lock->mutex);
|
|
if (!lock->read_wait.data) /* No waiting read locks */
|
|
{
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
data->type=TL_WRITE_DELAYED;
|
|
if (lock->update_status)
|
|
(*lock->update_status)(data->status_param);
|
|
if (((*data->prev)=data->next)) /* remove from lock-list */
|
|
data->next->prev= data->prev;
|
|
else
|
|
lock->write.last=data->prev;
|
|
|
|
if ((data->next=lock->write_wait.data)) /* Put first in lock_list */
|
|
data->next->prev= &data->next;
|
|
else
|
|
lock->write_wait.last= &data->next;
|
|
data->prev= &lock->write_wait.data;
|
|
data->cond=get_cond(); /* This was zero */
|
|
lock->write_wait.data=data;
|
|
free_all_read_locks(lock,0);
|
|
|
|
pthread_mutex_unlock(&lock->mutex);
|
|
DBUG_RETURN(thr_upgrade_write_delay_lock(data));
|
|
}
|
|
|
|
|
|
#include <my_sys.h>
|
|
|
|
static void thr_print_lock(const char* name,struct st_lock_list *list)
|
|
{
|
|
THR_LOCK_DATA *data,**prev;
|
|
uint count=0;
|
|
|
|
if (list->data)
|
|
{
|
|
printf("%-10s: ",name);
|
|
prev= &list->data;
|
|
for (data=list->data; data && count++ < MAX_LOCKS ; data=data->next)
|
|
{
|
|
printf("0x%lx (%lu:%d); ", (ulong) data, data->owner->info->thread_id,
|
|
(int) data->type);
|
|
if (data->prev != prev)
|
|
printf("\nWarning: prev didn't point at previous lock\n");
|
|
prev= &data->next;
|
|
}
|
|
puts("");
|
|
if (prev != list->last)
|
|
printf("Warning: last didn't point at last lock\n");
|
|
}
|
|
}
|
|
|
|
void thr_print_locks(void)
|
|
{
|
|
LIST *list;
|
|
uint count=0;
|
|
|
|
pthread_mutex_lock(&THR_LOCK_lock);
|
|
puts("Current locks:");
|
|
for (list= thr_lock_thread_list; list && count++ < MAX_THREADS;
|
|
list= list_rest(list))
|
|
{
|
|
THR_LOCK *lock=(THR_LOCK*) list->data;
|
|
VOID(pthread_mutex_lock(&lock->mutex));
|
|
printf("lock: 0x%lx:",(ulong) lock);
|
|
if ((lock->write_wait.data || lock->read_wait.data) &&
|
|
(! lock->read.data && ! lock->write.data))
|
|
printf(" WARNING: ");
|
|
if (lock->write.data)
|
|
printf(" write");
|
|
if (lock->write_wait.data)
|
|
printf(" write_wait");
|
|
if (lock->read.data)
|
|
printf(" read");
|
|
if (lock->read_wait.data)
|
|
printf(" read_wait");
|
|
puts("");
|
|
thr_print_lock("write",&lock->write);
|
|
thr_print_lock("write_wait",&lock->write_wait);
|
|
thr_print_lock("read",&lock->read);
|
|
thr_print_lock("read_wait",&lock->read_wait);
|
|
VOID(pthread_mutex_unlock(&lock->mutex));
|
|
puts("");
|
|
}
|
|
fflush(stdout);
|
|
pthread_mutex_unlock(&THR_LOCK_lock);
|
|
}
|
|
|
|
#endif /* THREAD */
|
|
|
|
/*****************************************************************************
|
|
** Test of thread locks
|
|
****************************************************************************/
|
|
|
|
#ifdef MAIN
|
|
|
|
#ifdef THREAD
|
|
|
|
struct st_test {
|
|
uint lock_nr;
|
|
enum thr_lock_type lock_type;
|
|
};
|
|
|
|
THR_LOCK locks[5]; /* 4 locks */
|
|
|
|
struct st_test test_0[] = {{0,TL_READ}}; /* One lock */
|
|
struct st_test test_1[] = {{0,TL_READ},{0,TL_WRITE}}; /* Read and write lock of lock 0 */
|
|
struct st_test test_2[] = {{1,TL_WRITE},{0,TL_READ},{2,TL_READ}};
|
|
struct st_test test_3[] = {{2,TL_WRITE},{1,TL_READ},{0,TL_READ}}; /* Deadlock with test_2 ? */
|
|
struct st_test test_4[] = {{0,TL_WRITE},{0,TL_READ},{0,TL_WRITE},{0,TL_READ}};
|
|
struct st_test test_5[] = {{0,TL_READ},{1,TL_READ},{2,TL_READ},{3,TL_READ}}; /* Many reads */
|
|
struct st_test test_6[] = {{0,TL_WRITE},{1,TL_WRITE},{2,TL_WRITE},{3,TL_WRITE}}; /* Many writes */
|
|
struct st_test test_7[] = {{3,TL_READ}};
|
|
struct st_test test_8[] = {{1,TL_READ_NO_INSERT},{2,TL_READ_NO_INSERT},{3,TL_READ_NO_INSERT}}; /* Should be quick */
|
|
struct st_test test_9[] = {{4,TL_READ_HIGH_PRIORITY}};
|
|
struct st_test test_10[] ={{4,TL_WRITE}};
|
|
struct st_test test_11[] = {{0,TL_WRITE_LOW_PRIORITY},{1,TL_WRITE_LOW_PRIORITY},{2,TL_WRITE_LOW_PRIORITY},{3,TL_WRITE_LOW_PRIORITY}}; /* Many writes */
|
|
struct st_test test_12[] = {{0,TL_WRITE_ALLOW_READ},{1,TL_WRITE_ALLOW_READ},{2,TL_WRITE_ALLOW_READ},{3,TL_WRITE_ALLOW_READ}}; /* Many writes */
|
|
struct st_test test_13[] = {{0,TL_WRITE_CONCURRENT_INSERT},{1,TL_WRITE_CONCURRENT_INSERT},{2,TL_WRITE_CONCURRENT_INSERT},{3,TL_WRITE_CONCURRENT_INSERT}};
|
|
struct st_test test_14[] = {{0,TL_WRITE_CONCURRENT_INSERT},{1,TL_READ}};
|
|
struct st_test test_15[] = {{0,TL_WRITE_ALLOW_WRITE},{1,TL_READ}};
|
|
struct st_test test_16[] = {{0,TL_WRITE_ALLOW_WRITE},{1,TL_WRITE_ALLOW_WRITE}};
|
|
|
|
struct st_test *tests[] = {test_0,test_1,test_2,test_3,test_4,test_5,test_6,
|
|
test_7,test_8,test_9,test_10,test_11,test_12,
|
|
test_13,test_14,test_15,test_16};
|
|
int lock_counts[]= {sizeof(test_0)/sizeof(struct st_test),
|
|
sizeof(test_1)/sizeof(struct st_test),
|
|
sizeof(test_2)/sizeof(struct st_test),
|
|
sizeof(test_3)/sizeof(struct st_test),
|
|
sizeof(test_4)/sizeof(struct st_test),
|
|
sizeof(test_5)/sizeof(struct st_test),
|
|
sizeof(test_6)/sizeof(struct st_test),
|
|
sizeof(test_7)/sizeof(struct st_test),
|
|
sizeof(test_8)/sizeof(struct st_test),
|
|
sizeof(test_9)/sizeof(struct st_test),
|
|
sizeof(test_10)/sizeof(struct st_test),
|
|
sizeof(test_11)/sizeof(struct st_test),
|
|
sizeof(test_12)/sizeof(struct st_test),
|
|
sizeof(test_13)/sizeof(struct st_test),
|
|
sizeof(test_14)/sizeof(struct st_test),
|
|
sizeof(test_15)/sizeof(struct st_test),
|
|
sizeof(test_16)/sizeof(struct st_test)
|
|
};
|
|
|
|
|
|
static pthread_cond_t COND_thread_count;
|
|
static pthread_mutex_t LOCK_thread_count;
|
|
static uint thread_count;
|
|
static ulong sum=0;
|
|
|
|
#define MAX_LOCK_COUNT 8
|
|
|
|
/* The following functions is for WRITE_CONCURRENT_INSERT */
|
|
|
|
static void test_get_status(void* param __attribute__((unused)),
|
|
int concurrent_insert __attribute__((unused)))
|
|
{
|
|
}
|
|
|
|
static void test_update_status(void* param __attribute__((unused)))
|
|
{
|
|
}
|
|
|
|
static void test_copy_status(void* to __attribute__((unused)) ,
|
|
void *from __attribute__((unused)))
|
|
{
|
|
}
|
|
|
|
static my_bool test_check_status(void* param __attribute__((unused)))
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
|
|
static void *test_thread(void *arg)
|
|
{
|
|
int i,j,param=*((int*) arg);
|
|
THR_LOCK_DATA data[MAX_LOCK_COUNT];
|
|
THR_LOCK_OWNER owner;
|
|
THR_LOCK_INFO lock_info;
|
|
THR_LOCK_DATA *multi_locks[MAX_LOCK_COUNT];
|
|
my_thread_init();
|
|
|
|
printf("Thread %s (%d) started\n",my_thread_name(),param); fflush(stdout);
|
|
|
|
|
|
thr_lock_info_init(&lock_info);
|
|
thr_lock_owner_init(&owner, &lock_info);
|
|
for (i=0; i < lock_counts[param] ; i++)
|
|
thr_lock_data_init(locks+tests[param][i].lock_nr,data+i,NULL);
|
|
for (j=1 ; j < 10 ; j++) /* try locking 10 times */
|
|
{
|
|
for (i=0; i < lock_counts[param] ; i++)
|
|
{ /* Init multi locks */
|
|
multi_locks[i]= &data[i];
|
|
data[i].type= tests[param][i].lock_type;
|
|
}
|
|
thr_multi_lock(multi_locks, lock_counts[param], &owner);
|
|
pthread_mutex_lock(&LOCK_thread_count);
|
|
{
|
|
int tmp=rand() & 7; /* Do something from 0-2 sec */
|
|
if (tmp == 0)
|
|
sleep(1);
|
|
else if (tmp == 1)
|
|
sleep(2);
|
|
else
|
|
{
|
|
ulong k;
|
|
for (k=0 ; k < (ulong) (tmp-2)*100000L ; k++)
|
|
sum+=k;
|
|
}
|
|
}
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
thr_multi_unlock(multi_locks,lock_counts[param]);
|
|
}
|
|
|
|
printf("Thread %s (%d) ended\n",my_thread_name(),param); fflush(stdout);
|
|
thr_print_locks();
|
|
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;
|
|
}
|
|
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
{
|
|
pthread_t tid;
|
|
pthread_attr_t thr_attr;
|
|
int i,*param,error;
|
|
MY_INIT(argv[0]);
|
|
if (argc > 1 && argv[1][0] == '-' && argv[1][1] == '#')
|
|
DBUG_PUSH(argv[1]+2);
|
|
|
|
printf("Main thread: %s\n",my_thread_name());
|
|
|
|
if ((error=pthread_cond_init(&COND_thread_count,NULL)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_cond_init (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
if ((error=pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_cond_init (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
|
|
for (i=0 ; i < (int) array_elements(locks) ; i++)
|
|
{
|
|
thr_lock_init(locks+i);
|
|
locks[i].check_status= test_check_status;
|
|
locks[i].update_status=test_update_status;
|
|
locks[i].copy_status= test_copy_status;
|
|
locks[i].get_status= test_get_status;
|
|
}
|
|
if ((error=pthread_attr_init(&thr_attr)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_attr_init (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
if ((error=pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED)))
|
|
{
|
|
fprintf(stderr,
|
|
"Got error: %d from pthread_attr_setdetachstate (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
#ifndef pthread_attr_setstacksize /* void return value */
|
|
if ((error=pthread_attr_setstacksize(&thr_attr,65536L)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_attr_setstacksize (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
#endif
|
|
#ifdef HAVE_THR_SETCONCURRENCY
|
|
VOID(thr_setconcurrency(2));
|
|
#endif
|
|
for (i=0 ; i < (int) array_elements(lock_counts) ; i++)
|
|
{
|
|
param=(int*) malloc(sizeof(int));
|
|
*param=i;
|
|
|
|
if ((error=pthread_mutex_lock(&LOCK_thread_count)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_mutex_lock (errno: %d)",
|
|
error,errno);
|
|
exit(1);
|
|
}
|
|
if ((error=pthread_create(&tid,&thr_attr,test_thread,(void*) param)))
|
|
{
|
|
fprintf(stderr,"Got error: %d from pthread_create (errno: %d)\n",
|
|
error,errno);
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
exit(1);
|
|
}
|
|
thread_count++;
|
|
pthread_mutex_unlock(&LOCK_thread_count);
|
|
}
|
|
|
|
pthread_attr_destroy(&thr_attr);
|
|
if ((error=pthread_mutex_lock(&LOCK_thread_count)))
|
|
fprintf(stderr,"Got error: %d from pthread_mutex_lock\n",error);
|
|
while (thread_count)
|
|
{
|
|
if ((error=pthread_cond_wait(&COND_thread_count,&LOCK_thread_count)))
|
|
fprintf(stderr,"Got error: %d from pthread_cond_wait\n",error);
|
|
}
|
|
if ((error=pthread_mutex_unlock(&LOCK_thread_count)))
|
|
fprintf(stderr,"Got error: %d from pthread_mutex_unlock\n",error);
|
|
for (i=0 ; i < (int) array_elements(locks) ; i++)
|
|
thr_lock_delete(locks+i);
|
|
#ifdef EXTRA_DEBUG
|
|
if (found_errors)
|
|
printf("Got %d warnings\n",found_errors);
|
|
else
|
|
#endif
|
|
printf("Test succeeded\n");
|
|
return 0;
|
|
}
|
|
|
|
#else /* THREAD */
|
|
|
|
int main(int argc __attribute__((unused)),char **argv __attribute__((unused)))
|
|
{
|
|
printf("thr_lock disabled because we are not using threads\n");
|
|
exit(1);
|
|
}
|
|
|
|
#endif /* THREAD */
|
|
#endif /* MAIN */
|