mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
fb2ff6daf3
------------------------------------------------------------------------ r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines Changed paths: M /branches/zip/lock/lock0lock.c branches/zip: Remove the additional check introduced in r6534 which tries to check if the joining transaction has any other transactions waiting on its locks. This optimization results in excessive deadlocks when running Sysbench with a large number of threads. The function seems to return FALSE positives. rb://250 ------------------------------------------------------------------------ r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines Changed paths: M /branches/zip/row/row0merge.c branches/zip: row_merge_drop_index(): Remove redundant condition on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique, because SYS_FIELDS is not indexed by TABLE_ID. ------------------------------------------------------------------------ r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines Changed paths: M /branches/zip/rem/rem0rec.c branches/zip: rec_get_nth_field_offs_old(): Replace if (!cond) ut_error; tests with ut_a(cond). ------------------------------------------------------------------------ r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line Changed paths: M /branches/zip/include/btr0pcur.h M /branches/zip/include/btr0pcur.ic branches/zip: btr_pcur_commit(): Unused function, remove. ------------------------------------------------------------------------ r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line Changed paths: M /branches/zip/handler/handler0alter.cc branches/zip: ha_innobase::add_index(): Check for !innodb_table. ------------------------------------------------------------------------ r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line Changed paths: M /branches/zip/dict/dict0dict.c branches/zip: dict_field_print_low(): Add const qualifier. ------------------------------------------------------------------------ r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines Changed paths: M /branches/zip/dict/dict0boot.c M /branches/zip/include/dict0boot.h M /branches/zip/row/row0merge.c M /branches/zip/row/row0mysql.c branches/zip: When dropping temporary indexes and tables at startup, first load them to the data dictionary cache and use the normal routines for dropping tables or indexes. This should reduce the risk of bugs and also make the code compatible with the upcoming TablespaceDictionary implementation. DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME. row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing temporary indexes, and load the tables as needed. Invoke row_merge_drop_index() to drop the indexes. row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables, load them with dict_load_table() and drop them with row_drop_table_for_mysql(). rb://251, not yet reviewed ------------------------------------------------------------------------ r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines Changed paths: M /branches/zip/include/log0recv.h M /branches/zip/log/log0recv.c M /branches/zip/srv/srv0start.c branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files innobase_start_or_create_for_mysql(): Roll back data dictionary transactions before scanning the *.ibd files. Then, data dictionary records can be loaded to the cache before opening the *.ibd files. recv_recovery_rollback_active(): Refactored from recv_recovery_from_checkpoint_finish(). rb://235, committing without review, because this is needed for TablespaceDictionary. ------------------------------------------------------------------------ r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines Changed paths: M /branches/zip/log/log0recv.c branches/zip: recv_recovery_rollback_active(): Drop the temporary tables and indexes after enabling sync order checks. This should not make any difference. This could have been done in r6611. ------------------------------------------------------------------------ r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines Changed paths: M /branches/zip/srv/srv0srv.c branches/plugin rb://242 Let the master thread sleep if the amount of work to be done is calibrated as taking less than a second. Approved by: Heikki ------------------------------------------------------------------------ r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line Changed paths: M /branches/zip/ChangeLog branches/zip: Document r6614 in ChangeLog. ------------------------------------------------------------------------ r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/buf/buf0buf.c M /branches/zip/lock/lock0lock.c branches/zip: Merge revisions 6538:6613 from branches/5.1: ------------------------------------------------------------------------ r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines Changed paths: M /branches/5.1/lock/lock0lock.c branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info incorrect when deadlock detection aborts". Print the correct lock owner when recursive function lock_deadlock_recursive() exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK. rb://217, approved by Marko. ------------------------------------------------------------------------ r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines Changed paths: M /branches/5.1/buf/buf0buf.c M /branches/5.1/buf/buf0rea.c M /branches/5.1/include/buf0rea.h branches/5.1: Fix Bug #38901 InnoDB logs error repeatedly when trying to load page into buffer pool In buf_page_get_gen() if we are unable to read a page (because of corruption or some other reason) we keep on retrying. This fills up error log with millions of entries in no time and we'd eventually run out of disk space. This patch limits the number of attempts that we make (currently set to 100) and after that we abort with a message. rb://241 Approved by: Heikki ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines Changed paths: M /branches/zip/row/row0sel.c branches/zip: Clean up after r6559. Now that btr_pcur_open_with_no_init() is a macro, do not mix preprocessor directives in the macro invocation, because it is implementation-defined whether that is going to work. ------------------------------------------------------------------------ r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line Changed paths: M /branches/zip/include/trx0rseg.h M /branches/zip/trx/trx0rseg.c branches/zip: trx_rseg_create(): Unused function, remove. ------------------------------------------------------------------------ r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines Changed paths: M /branches/zip/row/row0umod.c branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec. row_undo_mod_remove_clust_low(): Augment the function comment. row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(), row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec(): Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC); ------------------------------------------------------------------------ r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line Changed paths: M /branches/zip/include/que0que.h M /branches/zip/include/que0que.ic M /branches/zip/row/row0umod.c branches/zip: Introduce thr_is_recv(). ------------------------------------------------------------------------ r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines Changed paths: M /branches/zip/btr/btr0cur.c M /branches/zip/include/trx0types.h M /branches/zip/row/row0umod.c branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452) When rolling back an incomplete transaction in purge, tolerate missing BLOBs also in update undo, when undoing an INSERT by updating a delete-marked record, and the delete-marked record is no longer needed. Previously, we only tolerated missing BLOBs in insert undo. This merely fixes a debug assertion; the code performed correctly without UNIV_DEBUG. rb://249 approved by Sunny Bains. ------------------------------------------------------------------------ r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines Changed paths: M /branches/zip/include/mem0mem.h M /branches/zip/include/mem0mem.ic M /branches/zip/mem/mem0mem.c branches/zip bug# 49535 This is a backport of r4924. mem_heap_get_size() scans all allocated blocks to calculate the total size of the heap. This patch introduces a new, total_size, field in mem_block_info_struct. This field is valid only for base block (i.e.: the first block allocated for the heap) and is set to ULINT_UNDEFINED in other blocks. This considerably improves the performance of redo scan during recovery. rb://108 issue#216 Approved by: Heikki ------------------------------------------------------------------------ r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line Changed paths: M /branches/zip/row/row0umod.c branches/zip: Remove bogus debug assertions introduced in r6660. ------------------------------------------------------------------------ r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip ChangeLog entry for r6674. ------------------------------------------------------------------------ r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines Changed paths: M /branches/zip/trx/trx0trx.c branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex is held by the caller. ------------------------------------------------------------------------ r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Change the bit fields back to ulint. Bit fields were causing problems with concurrency on SMP systems because of word packing issues. The number of trx_t's in a system is not sufficient enough to require that we try and save a few bytes in the data structure. See rb://255 for details. ------------------------------------------------------------------------ r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Update the comments and fix the whitespace issues. See rb://255 Approved by: Marko ------------------------------------------------------------------------ r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Fix comment. Non functional change. ------------------------------------------------------------------------ r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines Changed paths: M /branches/zip/include/log0log.ic branches/zip: log_reserve_and_write_fast(): Correct a race condition in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440. ------------------------------------------------------------------------ r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Fix a comment. ------------------------------------------------------------------------ r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines Changed paths: M /branches/zip/lock/lock0lock.c branches/zip: lock_table_other_has_incompatible(): Return an incompatible lock or NULL instead of TRUE or FALSE. Approved by Sunny over IM. ------------------------------------------------------------------------ r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines Changed paths: M /branches/zip/os/os0file.c branches/zip: Merge revisions 6613:6669 from branches/5.1: ------------------------------------------------------------------------ r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines branches/5.1: Fix bug #50691, AIX implementation of readdir_r causes InnoDB errors. readdir_r() returns an non-NULL value in the case of reaching the end of a directory. It should not be treated as an error return. rb://238 approved by Marko ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines Changed paths: M /branches/zip/include/fil0fil.h branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid for the first page of each ibdata* file, not *.ibd files. Suggested by Heikki, in connection with the LSN warning noted in Issue #341. ------------------------------------------------------------------------ r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines Changed paths: M /branches/zip/fsp/fsp0fsp.c branches/zip: fsp_init_file_page_low(): Declare the page uninitialized for Valgrind. ------------------------------------------------------------------------ r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines Changed paths: M /branches/zip/fsp/fsp0fsp.c M /branches/zip/include/univ.i branches/zip: Remove UNIV_BASIC_LOG_DEBUG. This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341. Suggested by Heikki. ------------------------------------------------------------------------ r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines Changed paths: M /branches/zip/lock/lock0lock.c branches/zip: Don't print the entire lock bit set if the block was not found in the buffer pool. Only print the bits that are set and that information is in the lock and not in the block. See rb://256 approved by Marko. ------------------------------------------------------------------------ r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines Changed paths: M /branches/embedded-1.0/btr/btr0btr.c M /branches/embedded-1.0/btr/btr0cur.c M /branches/embedded-1.0/btr/btr0pcur.c M /branches/embedded-1.0/buf/buf0buf.c M /branches/embedded-1.0/buf/buf0flu.c M /branches/embedded-1.0/buf/buf0lru.c M /branches/embedded-1.0/dict/dict0boot.c M /branches/embedded-1.0/dict/dict0crea.c M /branches/embedded-1.0/dict/dict0dict.c M /branches/embedded-1.0/dict/dict0load.c M /branches/embedded-1.0/fil/fil0fil.c M /branches/embedded-1.0/fsp/fsp0fsp.c M /branches/embedded-1.0/ibuf/ibuf0ibuf.c M /branches/embedded-1.0/include/btr0btr.h M /branches/embedded-1.0/include/btr0cur.h M /branches/embedded-1.0/include/btr0pcur.h M /branches/embedded-1.0/include/btr0pcur.ic M /branches/embedded-1.0/include/buf0buf.h M /branches/embedded-1.0/include/buf0buf.ic M /branches/embedded-1.0/include/dict0boot.h M /branches/embedded-1.0/include/fil0fil.h M /branches/embedded-1.0/include/lock0lock.h M /branches/embedded-1.0/include/log0log.h M /branches/embedded-1.0/include/log0log.ic M /branches/embedded-1.0/include/log0recv.h M /branches/embedded-1.0/include/mem0dbg.h M /branches/embedded-1.0/include/mem0dbg.ic M /branches/embedded-1.0/include/mem0mem.h M /branches/embedded-1.0/include/mem0mem.ic M /branches/embedded-1.0/include/os0file.h M /branches/embedded-1.0/include/os0sync.h M /branches/embedded-1.0/include/os0sync.ic M /branches/embedded-1.0/include/os0thread.h M /branches/embedded-1.0/include/que0que.h M /branches/embedded-1.0/include/que0que.ic M /branches/embedded-1.0/include/row0merge.h M /branches/embedded-1.0/include/row0prebuilt.h M /branches/embedded-1.0/include/srv0srv.h M /branches/embedded-1.0/include/sync0sync.h M /branches/embedded-1.0/include/trx0rseg.h M /branches/embedded-1.0/include/trx0sys.h M /branches/embedded-1.0/include/trx0trx.h M /branches/embedded-1.0/include/trx0types.h M /branches/embedded-1.0/include/trx0undo.h M /branches/embedded-1.0/include/trx0xa.h M /branches/embedded-1.0/include/univ.i M /branches/embedded-1.0/include/ut0vec.h M /branches/embedded-1.0/include/ut0vec.ic M /branches/embedded-1.0/lock/lock0lock.c M /branches/embedded-1.0/log/log0log.c M /branches/embedded-1.0/log/log0recv.c M /branches/embedded-1.0/mem/mem0mem.c M /branches/embedded-1.0/os/os0file.c M /branches/embedded-1.0/os/os0thread.c M /branches/embedded-1.0/page/page0page.c M /branches/embedded-1.0/rem/rem0rec.c M /branches/embedded-1.0/row/row0ins.c M /branches/embedded-1.0/row/row0merge.c M /branches/embedded-1.0/row/row0prebuilt.c M /branches/embedded-1.0/row/row0sel.c M /branches/embedded-1.0/row/row0umod.c M /branches/embedded-1.0/row/row0undo.c M /branches/embedded-1.0/row/row0upd.c M /branches/embedded-1.0/srv/srv0srv.c M /branches/embedded-1.0/srv/srv0start.c M /branches/embedded-1.0/sync/sync0sync.c M /branches/embedded-1.0/trx/trx0sys.c M /branches/embedded-1.0/trx/trx0trx.c M /branches/embedded-1.0/trx/trx0undo.c M /branches/embedded-1.0/ut/ut0mem.c M /branches/innodb+/btr/btr0btr.c M /branches/innodb+/btr/btr0cur.c M /branches/innodb+/btr/btr0pcur.c M /branches/innodb+/buf/buf0buf.c M /branches/innodb+/buf/buf0lru.c M /branches/innodb+/dict/dict0crea.c M /branches/innodb+/dict/dict0dict.c M /branches/innodb+/dict/dict0load.c M /branches/innodb+/handler/ha_innodb.cc M /branches/innodb+/handler/ha_innodb.h M /branches/innodb+/handler/handler0alter.cc M /branches/innodb+/include/btr0btr.h M /branches/innodb+/include/btr0cur.h M /branches/innodb+/include/btr0pcur.h M /branches/innodb+/include/btr0pcur.ic M /branches/innodb+/include/buf0buf.h M /branches/innodb+/include/log0log.h M /branches/innodb+/include/mem0dbg.h M /branches/innodb+/include/mem0dbg.ic M /branches/innodb+/include/os0file.h M /branches/innodb+/include/row0mysql.h M /branches/innodb+/include/srv0srv.h M /branches/innodb+/include/sync0sync.h M /branches/innodb+/include/trx0trx.h M /branches/innodb+/lock/lock0lock.c M /branches/innodb+/log/log0log.c M /branches/innodb+/log/log0recv.c M /branches/innodb+/mem/mem0dbg.c M /branches/innodb+/os/os0file.c M /branches/innodb+/page/page0page.c M /branches/innodb+/row/row0ins.c M /branches/innodb+/row/row0mysql.c M /branches/innodb+/row/row0sel.c M /branches/innodb+/srv/srv0srv.c M /branches/innodb+/srv/srv0start.c M /branches/innodb+/sync/sync0sync.c M /branches/innodb+_metrics_table/btr/btr0btr.c M /branches/innodb+_metrics_table/buf/buf0buf.c M /branches/innodb+_metrics_table/buf/buf0flu.c M /branches/innodb+_metrics_table/dict/dict0crea.c M /branches/innodb+_metrics_table/dict/dict0dict.c M /branches/innodb+_metrics_table/dict/dict0load.c M /branches/innodb+_metrics_table/handler/ha_innodb.cc M /branches/innodb+_metrics_table/handler/ha_innodb.h M /branches/innodb+_metrics_table/handler/handler0alter.cc M /branches/innodb+_metrics_table/handler/i_s.cc M /branches/innodb+_metrics_table/handler/i_s.h M /branches/innodb+_metrics_table/include/mem0dbg.h M /branches/innodb+_metrics_table/include/mem0dbg.ic M /branches/innodb+_metrics_table/include/srv0mon.h M /branches/innodb+_metrics_table/include/srv0mon.ic M /branches/innodb+_metrics_table/include/srv0srv.h M /branches/innodb+_metrics_table/lock/lock0lock.c M /branches/innodb+_metrics_table/log/log0log.c M /branches/innodb+_metrics_table/mem/mem0dbg.c M /branches/innodb+_metrics_table/os/os0file.c M /branches/innodb+_metrics_table/page/page0zip.c M /branches/innodb+_metrics_table/row/row0mysql.c M /branches/innodb+_metrics_table/row/row0purge.c M /branches/innodb+_metrics_table/row/row0sel.c M /branches/innodb+_metrics_table/srv/srv0mon.c M /branches/innodb+_metrics_table/srv/srv0srv.c M /branches/innodb+_metrics_table/sync/sync0sync.c M /branches/innodb+_metrics_table/trx/trx0roll.c M /branches/innodb+_metrics_table/trx/trx0trx.c M /branches/innodb+_persistent_stats/btr/btr0btr.c M /branches/innodb+_persistent_stats/buf/buf0buf.c M /branches/innodb+_persistent_stats/data/data0type.c M /branches/innodb+_persistent_stats/dict/dict0boot.c M /branches/innodb+_persistent_stats/dict/dict0crea.c M /branches/innodb+_persistent_stats/dict/dict0dict.c M /branches/innodb+_persistent_stats/dict/dict0load.c M /branches/innodb+_persistent_stats/dict/dict0mem.c M /branches/innodb+_persistent_stats/fil/fil0fil.c M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c M /branches/innodb+_persistent_stats/handler/ha_innodb.cc M /branches/innodb+_persistent_stats/handler/ha_innodb.h M /branches/innodb+_persistent_stats/handler/handler0alter.cc M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c M /branches/innodb+_persistent_stats/include/btr0pcur.h M /branches/innodb+_persistent_stats/include/btr0pcur.ic M /branches/innodb+_persistent_stats/include/db0err.h M /branches/innodb+_persistent_stats/include/dict0dict.h M /branches/innodb+_persistent_stats/include/dict0mem.h M /branches/innodb+_persistent_stats/include/ha_prototypes.h M /branches/innodb+_persistent_stats/include/lock0lock.h M /branches/innodb+_persistent_stats/include/log0log.h M /branches/innodb+_persistent_stats/include/log0recv.h M /branches/innodb+_persistent_stats/include/mem0dbg.h M /branches/innodb+_persistent_stats/include/mem0dbg.ic M /branches/innodb+_persistent_stats/include/os0file.h M /branches/innodb+_persistent_stats/include/pars0pars.h M /branches/innodb+_persistent_stats/include/srv0srv.h M /branches/innodb+_persistent_stats/include/sync0sync.h M /branches/innodb+_persistent_stats/include/trx0sys.h M /branches/innodb+_persistent_stats/include/trx0trx.h M /branches/innodb+_persistent_stats/include/ut0lst.h M /branches/innodb+_persistent_stats/include/ut0ut.h M /branches/innodb+_persistent_stats/lock/lock0lock.c M /branches/innodb+_persistent_stats/log/log0log.c M /branches/innodb+_persistent_stats/log/log0recv.c M /branches/innodb+_persistent_stats/mem/mem0dbg.c M /branches/innodb+_persistent_stats/os/os0file.c M /branches/innodb+_persistent_stats/page/page0page.c M /branches/innodb+_persistent_stats/pars/pars0pars.c M /branches/innodb+_persistent_stats/row/row0merge.c M /branches/innodb+_persistent_stats/row/row0mysql.c M /branches/innodb+_persistent_stats/row/row0sel.c M /branches/innodb+_persistent_stats/row/row0umod.c M /branches/innodb+_persistent_stats/row/row0upd.c M /branches/innodb+_persistent_stats/srv/srv0srv.c M /branches/innodb+_persistent_stats/srv/srv0start.c M /branches/innodb+_persistent_stats/sync/sync0sync.c M /branches/innodb+_persistent_stats/trx/trx0i_s.c M /branches/innodb+_persistent_stats/trx/trx0sys.c M /branches/innodb+_persistent_stats/trx/trx0trx.c M /branches/innodb+_persistent_stats/ut/ut0ut.c M /branches/innofts+/handler/ha_innodb.cc M /branches/innofts+/handler/i_s.cc M /branches/innofts+/handler/i_s.h M /branches/innofts+/include/fut0fut.h M /branches/performance_schema/btr/btr0sea.c M /branches/performance_schema/buf/buf0buf.c M /branches/performance_schema/dict/dict0dict.c M /branches/performance_schema/fil/fil0fil.c M /branches/performance_schema/handler/ha_innodb.cc M /branches/performance_schema/include/srv0srv.h M /branches/performance_schema/include/sync0rw.h M /branches/performance_schema/include/sync0rw.ic M /branches/performance_schema/include/sync0sync.h M /branches/performance_schema/include/sync0sync.ic M /branches/performance_schema/include/sync0types.h M /branches/performance_schema/log/log0log.c M /branches/performance_schema/srv/srv0srv.c M /branches/performance_schema/sync/sync0rw.c M /branches/performance_schema/trx/trx0i_s.c M /branches/performance_schema/trx/trx0purge.c M /branches/plugin-2.0/buf/buf0buf.c M /branches/plugin-2.0/buf/buf0lru.c M /branches/plugin-2.0/dict/dict0boot.c M /branches/plugin-2.0/dict/dict0crea.c M /branches/plugin-2.0/dict/dict0dict.c M /branches/plugin-2.0/dict/dict0load.c M /branches/plugin-2.0/dict/dict0mem.c M /branches/plugin-2.0/fil/fil0fil.c M /branches/plugin-2.0/fsp/fsp0fsp.c M /branches/plugin-2.0/handler/ha_innodb.cc M /branches/plugin-2.0/handler/ha_innodb.h M /branches/plugin-2.0/handler/handler0alter.cc M /branches/plugin-2.0/ibuf/ibuf0ibuf.c M /branches/plugin-2.0/include/dict0mem.h M /branches/plugin-2.0/include/ha_prototypes.h M /branches/plugin-2.0/include/lock0lock.h M /branches/plugin-2.0/include/log0log.h M /branches/plugin-2.0/include/log0recv.h M /branches/plugin-2.0/include/mem0dbg.h M /branches/plugin-2.0/include/mem0dbg.ic M /branches/plugin-2.0/include/os0file.h M /branches/plugin-2.0/include/row0mysql.h M /branches/plugin-2.0/include/srv0srv.h M /branches/plugin-2.0/include/sync0sync.h M /branches/plugin-2.0/include/trx0sys.h M /branches/plugin-2.0/include/trx0trx.h M /branches/plugin-2.0/lock/lock0lock.c M /branches/plugin-2.0/log/log0log.c M /branches/plugin-2.0/log/log0recv.c M /branches/plugin-2.0/mem/mem0dbg.c M /branches/plugin-2.0/os/os0file.c M /branches/plugin-2.0/page/page0page.c M /branches/plugin-2.0/row/row0merge.c M /branches/plugin-2.0/row/row0mysql.c M /branches/plugin-2.0/row/row0sel.c M /branches/plugin-2.0/row/row0umod.c M /branches/plugin-2.0/row/row0upd.c M /branches/plugin-2.0/srv/srv0srv.c M /branches/plugin-2.0/srv/srv0start.c M /branches/plugin-2.0/sync/sync0sync.c M /branches/plugin-2.0/trx/trx0i_s.c M /branches/plugin-2.0/trx/trx0sys.c M /branches/plugin-2.0/trx/trx0trx.c M /branches/zip/btr/btr0btr.c M /branches/zip/btr/btr0cur.c M /branches/zip/btr/btr0pcur.c M /branches/zip/buf/buf0buf.c M /branches/zip/buf/buf0lru.c M /branches/zip/dict/dict0boot.c M /branches/zip/dict/dict0crea.c M /branches/zip/dict/dict0dict.c M /branches/zip/dict/dict0load.c M /branches/zip/fsp/fsp0fsp.c M /branches/zip/handler/ha_innodb.cc M /branches/zip/handler/ha_innodb.h M /branches/zip/handler/handler0alter.cc M /branches/zip/include/btr0btr.h M /branches/zip/include/btr0cur.h M /branches/zip/include/btr0pcur.h M /branches/zip/include/btr0pcur.ic M /branches/zip/include/buf0buf.h M /branches/zip/include/dict0boot.h M /branches/zip/include/fil0fil.h M /branches/zip/include/log0log.h M /branches/zip/include/log0log.ic M /branches/zip/include/log0recv.h M /branches/zip/include/mem0dbg.h M /branches/zip/include/mem0dbg.ic M /branches/zip/include/mem0mem.h M /branches/zip/include/mem0mem.ic M /branches/zip/include/os0file.h M /branches/zip/include/que0que.h M /branches/zip/include/que0que.ic M /branches/zip/include/row0mysql.h M /branches/zip/include/srv0srv.h M /branches/zip/include/sync0sync.h M /branches/zip/include/trx0rseg.h M /branches/zip/include/trx0trx.h M /branches/zip/include/trx0types.h M /branches/zip/include/univ.i M /branches/zip/lock/lock0lock.c M /branches/zip/log/log0log.c M /branches/zip/log/log0recv.c M /branches/zip/mem/mem0dbg.c M /branches/zip/mem/mem0mem.c M /branches/zip/os/os0file.c M /branches/zip/page/page0page.c M /branches/zip/rem/rem0rec.c M /branches/zip/row/row0ins.c M /branches/zip/row/row0merge.c M /branches/zip/row/row0mysql.c M /branches/zip/row/row0sel.c M /branches/zip/row/row0umod.c M /branches/zip/srv/srv0srv.c M /branches/zip/srv/srv0start.c M /branches/zip/sync/sync0sync.c M /branches/zip/trx/trx0rseg.c M /branches/zip/trx/trx0trx.c Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done ------------------------------------------------------------------------ r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines Changed paths: M /branches/zip/include/row0sel.h M /branches/zip/row/row0sel.c branches/zip: row_fetch_store_uint4(): Remove unused function. This was added to trunk in r435. ------------------------------------------------------------------------ r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines Changed paths: M /branches/zip/row/row0merge.c branches/zip: Allocate the merge sort buffers from a heap, not stack. The merge sort can use up to 48KiB of buffers when merging blocks. That can cause a stack overflow, especially on 64-bit systems when not building with inlined functions. This was reported as Issue #462. row_merge_dup_report(): Allocate buf and offsets from a heap. row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus sizeof arithmetics that happened to work, because sizeof(ulint)==sizeof(void*). row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap. row_merge_insert_index_tuples(): Allocate buf from graph_heap. rb://258 approved and tested by Sunny Bains ------------------------------------------------------------------------ r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines Changed paths: M /branches/zip/srv/srv0srv.c branches/zip: fix bug#51587 Non-functional change. ------------------------------------------------------------------------ r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines Changed paths: M /branches/zip/include/btr0btr.h M /branches/zip/include/btr0btr.ic branches/zip: Add a NOTE to the comment of btr_node_ptr_get_child_page_no() to prevent mysterious bugs. ------------------------------------------------------------------------ r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines Changed paths: M /branches/zip/handler/handler0alter.cc M /branches/zip/mysql-test/innodb-index.result M /branches/zip/mysql-test/innodb-index.test M /branches/zip/mysql-test/innodb.result M /branches/zip/mysql-test/innodb.test branches/zip: Disallow duplicate index name when creating an index. This should fix Mantis Issue #461. innodb.test, innodb.result, innodb-index.test, innodb-index.result: Adjust the test result and mention that the introduced restriction has been reported as MySQL Bug #51451. innobase_check_index_keys(): Add a parameter for the InnoDB table and check that no duplicate index name is added. Report errors by my_error() instead of sql_print_error(). rb://260 approved by Sunny Bains ------------------------------------------------------------------------ r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line Changed paths: M /branches/zip/ChangeLog Document r6770. ------------------------------------------------------------------------ r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines Changed paths: M /branches/zip/row/row0row.c branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning of possibly uninitialized variable format_in_hex. ------------------------------------------------------------------------
640 lines
16 KiB
Text
640 lines
16 KiB
Text
/*****************************************************************************
|
|
|
|
Copyright (c) 1994, 2010, Innobase Oy. All Rights Reserved.
|
|
|
|
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
|
|
|
|
*****************************************************************************/
|
|
|
|
/********************************************************************//**
|
|
@file include/mem0mem.ic
|
|
The memory management
|
|
|
|
Created 6/8/1994 Heikki Tuuri
|
|
*************************************************************************/
|
|
|
|
#include "mem0dbg.ic"
|
|
#ifndef UNIV_HOTBACKUP
|
|
# include "mem0pool.h"
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
/***************************************************************//**
|
|
Creates a memory heap block where data can be allocated.
|
|
@return own: memory heap block, NULL if did not succeed (only possible
|
|
for MEM_HEAP_BTR_SEARCH type heaps) */
|
|
UNIV_INTERN
|
|
mem_block_t*
|
|
mem_heap_create_block(
|
|
/*==================*/
|
|
mem_heap_t* heap, /*!< in: memory heap or NULL if first block
|
|
should be created */
|
|
ulint n, /*!< in: number of bytes needed for user data */
|
|
ulint type, /*!< in: type of heap: MEM_HEAP_DYNAMIC or
|
|
MEM_HEAP_BUFFER */
|
|
const char* file_name,/*!< in: file name where created */
|
|
ulint line); /*!< in: line where created */
|
|
/******************************************************************//**
|
|
Frees a block from a memory heap. */
|
|
UNIV_INTERN
|
|
void
|
|
mem_heap_block_free(
|
|
/*================*/
|
|
mem_heap_t* heap, /*!< in: heap */
|
|
mem_block_t* block); /*!< in: block to free */
|
|
#ifndef UNIV_HOTBACKUP
|
|
/******************************************************************//**
|
|
Frees the free_block field from a memory heap. */
|
|
UNIV_INTERN
|
|
void
|
|
mem_heap_free_block_free(
|
|
/*=====================*/
|
|
mem_heap_t* heap); /*!< in: heap */
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
/***************************************************************//**
|
|
Adds a new block to a memory heap.
|
|
@return created block, NULL if did not succeed (only possible for
|
|
MEM_HEAP_BTR_SEARCH type heaps) */
|
|
UNIV_INTERN
|
|
mem_block_t*
|
|
mem_heap_add_block(
|
|
/*===============*/
|
|
mem_heap_t* heap, /*!< in: memory heap */
|
|
ulint n); /*!< in: number of bytes user needs */
|
|
|
|
UNIV_INLINE
|
|
void
|
|
mem_block_set_len(mem_block_t* block, ulint len)
|
|
{
|
|
ut_ad(len > 0);
|
|
|
|
block->len = len;
|
|
}
|
|
|
|
UNIV_INLINE
|
|
ulint
|
|
mem_block_get_len(mem_block_t* block)
|
|
{
|
|
return(block->len);
|
|
}
|
|
|
|
UNIV_INLINE
|
|
void
|
|
mem_block_set_type(mem_block_t* block, ulint type)
|
|
{
|
|
ut_ad((type == MEM_HEAP_DYNAMIC) || (type == MEM_HEAP_BUFFER)
|
|
|| (type == MEM_HEAP_BUFFER + MEM_HEAP_BTR_SEARCH));
|
|
|
|
block->type = type;
|
|
}
|
|
|
|
UNIV_INLINE
|
|
ulint
|
|
mem_block_get_type(mem_block_t* block)
|
|
{
|
|
return(block->type);
|
|
}
|
|
|
|
UNIV_INLINE
|
|
void
|
|
mem_block_set_free(mem_block_t* block, ulint free)
|
|
{
|
|
ut_ad(free > 0);
|
|
ut_ad(free <= mem_block_get_len(block));
|
|
|
|
block->free = free;
|
|
}
|
|
|
|
UNIV_INLINE
|
|
ulint
|
|
mem_block_get_free(mem_block_t* block)
|
|
{
|
|
return(block->free);
|
|
}
|
|
|
|
UNIV_INLINE
|
|
void
|
|
mem_block_set_start(mem_block_t* block, ulint start)
|
|
{
|
|
ut_ad(start > 0);
|
|
|
|
block->start = start;
|
|
}
|
|
|
|
UNIV_INLINE
|
|
ulint
|
|
mem_block_get_start(mem_block_t* block)
|
|
{
|
|
return(block->start);
|
|
}
|
|
|
|
/***************************************************************//**
|
|
Allocates and zero-fills n bytes of memory from a memory heap.
|
|
@return allocated, zero-filled storage */
|
|
UNIV_INLINE
|
|
void*
|
|
mem_heap_zalloc(
|
|
/*============*/
|
|
mem_heap_t* heap, /*!< in: memory heap */
|
|
ulint n) /*!< in: number of bytes; if the heap is allowed
|
|
to grow into the buffer pool, this must be
|
|
<= MEM_MAX_ALLOC_IN_BUF */
|
|
{
|
|
ut_ad(heap);
|
|
ut_ad(!(heap->type & MEM_HEAP_BTR_SEARCH));
|
|
return(memset(mem_heap_alloc(heap, n), 0, n));
|
|
}
|
|
|
|
/***************************************************************//**
|
|
Allocates n bytes of memory from a memory heap.
|
|
@return allocated storage, NULL if did not succeed (only possible for
|
|
MEM_HEAP_BTR_SEARCH type heaps) */
|
|
UNIV_INLINE
|
|
void*
|
|
mem_heap_alloc(
|
|
/*===========*/
|
|
mem_heap_t* heap, /*!< in: memory heap */
|
|
ulint n) /*!< in: number of bytes; if the heap is allowed
|
|
to grow into the buffer pool, this must be
|
|
<= MEM_MAX_ALLOC_IN_BUF */
|
|
{
|
|
mem_block_t* block;
|
|
void* buf;
|
|
ulint free;
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
block = UT_LIST_GET_LAST(heap->base);
|
|
|
|
ut_ad(!(block->type & MEM_HEAP_BUFFER) || (n <= MEM_MAX_ALLOC_IN_BUF));
|
|
|
|
/* Check if there is enough space in block. If not, create a new
|
|
block to the heap */
|
|
|
|
if (mem_block_get_len(block)
|
|
< mem_block_get_free(block) + MEM_SPACE_NEEDED(n)) {
|
|
|
|
block = mem_heap_add_block(heap, n);
|
|
|
|
if (block == NULL) {
|
|
|
|
return(NULL);
|
|
}
|
|
}
|
|
|
|
free = mem_block_get_free(block);
|
|
|
|
buf = (byte*)block + free;
|
|
|
|
mem_block_set_free(block, free + MEM_SPACE_NEEDED(n));
|
|
|
|
#ifdef UNIV_MEM_DEBUG
|
|
UNIV_MEM_ALLOC(buf,
|
|
n + MEM_FIELD_HEADER_SIZE + MEM_FIELD_TRAILER_SIZE);
|
|
|
|
/* In the debug version write debugging info to the field */
|
|
mem_field_init((byte*)buf, n);
|
|
|
|
/* Advance buf to point at the storage which will be given to the
|
|
caller */
|
|
buf = (byte*)buf + MEM_FIELD_HEADER_SIZE;
|
|
|
|
#endif
|
|
#ifdef UNIV_SET_MEM_TO_ZERO
|
|
UNIV_MEM_ALLOC(buf, n);
|
|
memset(buf, '\0', n);
|
|
#endif
|
|
UNIV_MEM_ALLOC(buf, n);
|
|
return(buf);
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
Returns a pointer to the heap top.
|
|
@return pointer to the heap top */
|
|
UNIV_INLINE
|
|
byte*
|
|
mem_heap_get_heap_top(
|
|
/*==================*/
|
|
mem_heap_t* heap) /*!< in: memory heap */
|
|
{
|
|
mem_block_t* block;
|
|
byte* buf;
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
block = UT_LIST_GET_LAST(heap->base);
|
|
|
|
buf = (byte*)block + mem_block_get_free(block);
|
|
|
|
return(buf);
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
Frees the space in a memory heap exceeding the pointer given. The
|
|
pointer must have been acquired from mem_heap_get_heap_top. The first
|
|
memory block of the heap is not freed. */
|
|
UNIV_INLINE
|
|
void
|
|
mem_heap_free_heap_top(
|
|
/*===================*/
|
|
mem_heap_t* heap, /*!< in: heap from which to free */
|
|
byte* old_top)/*!< in: pointer to old top of heap */
|
|
{
|
|
mem_block_t* block;
|
|
mem_block_t* prev_block;
|
|
#ifdef UNIV_MEM_DEBUG
|
|
ibool error;
|
|
ulint total_size;
|
|
ulint size;
|
|
#endif
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
#ifdef UNIV_MEM_DEBUG
|
|
|
|
/* Validate the heap and get its total allocated size */
|
|
mem_heap_validate_or_print(heap, NULL, FALSE, &error, &total_size,
|
|
NULL, NULL);
|
|
ut_a(!error);
|
|
|
|
/* Get the size below top pointer */
|
|
mem_heap_validate_or_print(heap, old_top, FALSE, &error, &size, NULL,
|
|
NULL);
|
|
ut_a(!error);
|
|
|
|
#endif
|
|
|
|
block = UT_LIST_GET_LAST(heap->base);
|
|
|
|
while (block != NULL) {
|
|
if (((byte*)block + mem_block_get_free(block) >= old_top)
|
|
&& ((byte*)block <= old_top)) {
|
|
/* Found the right block */
|
|
|
|
break;
|
|
}
|
|
|
|
/* Store prev_block value before freeing the current block
|
|
(the current block will be erased in freeing) */
|
|
|
|
prev_block = UT_LIST_GET_PREV(list, block);
|
|
|
|
mem_heap_block_free(heap, block);
|
|
|
|
block = prev_block;
|
|
}
|
|
|
|
ut_ad(block);
|
|
|
|
/* Set the free field of block */
|
|
mem_block_set_free(block, old_top - (byte*)block);
|
|
|
|
#ifdef UNIV_MEM_DEBUG
|
|
ut_ad(mem_block_get_start(block) <= mem_block_get_free(block));
|
|
|
|
/* In the debug version erase block from top up */
|
|
mem_erase_buf(old_top, (byte*)block + block->len - old_top);
|
|
|
|
/* Update allocated memory count */
|
|
mutex_enter(&mem_hash_mutex);
|
|
mem_current_allocated_memory -= (total_size - size);
|
|
mutex_exit(&mem_hash_mutex);
|
|
#else /* UNIV_MEM_DEBUG */
|
|
UNIV_MEM_ASSERT_W(old_top, (byte*)block + block->len - old_top);
|
|
#endif /* UNIV_MEM_DEBUG */
|
|
UNIV_MEM_ALLOC(old_top, (byte*)block + block->len - old_top);
|
|
|
|
/* If free == start, we may free the block if it is not the first
|
|
one */
|
|
|
|
if ((heap != block) && (mem_block_get_free(block)
|
|
== mem_block_get_start(block))) {
|
|
mem_heap_block_free(heap, block);
|
|
}
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
Empties a memory heap. The first memory block of the heap is not freed. */
|
|
UNIV_INLINE
|
|
void
|
|
mem_heap_empty(
|
|
/*===========*/
|
|
mem_heap_t* heap) /*!< in: heap to empty */
|
|
{
|
|
mem_heap_free_heap_top(heap, (byte*)heap + mem_block_get_start(heap));
|
|
#ifndef UNIV_HOTBACKUP
|
|
if (heap->free_block) {
|
|
mem_heap_free_block_free(heap);
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
Returns a pointer to the topmost element in a memory heap. The size of the
|
|
element must be given.
|
|
@return pointer to the topmost element */
|
|
UNIV_INLINE
|
|
void*
|
|
mem_heap_get_top(
|
|
/*=============*/
|
|
mem_heap_t* heap, /*!< in: memory heap */
|
|
ulint n) /*!< in: size of the topmost element */
|
|
{
|
|
mem_block_t* block;
|
|
void* buf;
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
block = UT_LIST_GET_LAST(heap->base);
|
|
|
|
buf = (byte*)block + mem_block_get_free(block) - MEM_SPACE_NEEDED(n);
|
|
|
|
#ifdef UNIV_MEM_DEBUG
|
|
ut_ad(mem_block_get_start(block) <=(ulint)((byte*)buf - (byte*)block));
|
|
|
|
/* In the debug version, advance buf to point at the storage which
|
|
was given to the caller in the allocation*/
|
|
|
|
buf = (byte*)buf + MEM_FIELD_HEADER_SIZE;
|
|
|
|
/* Check that the field lengths agree */
|
|
ut_ad(n == (ulint)mem_field_header_get_len(buf));
|
|
#endif
|
|
|
|
return(buf);
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
Frees the topmost element in a memory heap. The size of the element must be
|
|
given. */
|
|
UNIV_INLINE
|
|
void
|
|
mem_heap_free_top(
|
|
/*==============*/
|
|
mem_heap_t* heap, /*!< in: memory heap */
|
|
ulint n) /*!< in: size of the topmost element */
|
|
{
|
|
mem_block_t* block;
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
block = UT_LIST_GET_LAST(heap->base);
|
|
|
|
/* Subtract the free field of block */
|
|
mem_block_set_free(block, mem_block_get_free(block)
|
|
- MEM_SPACE_NEEDED(n));
|
|
UNIV_MEM_ASSERT_W((byte*) block + mem_block_get_free(block), n);
|
|
#ifdef UNIV_MEM_DEBUG
|
|
|
|
ut_ad(mem_block_get_start(block) <= mem_block_get_free(block));
|
|
|
|
/* In the debug version check the consistency, and erase field */
|
|
mem_field_erase((byte*)block + mem_block_get_free(block), n);
|
|
#endif
|
|
|
|
/* If free == start, we may free the block if it is not the first
|
|
one */
|
|
|
|
if ((heap != block) && (mem_block_get_free(block)
|
|
== mem_block_get_start(block))) {
|
|
mem_heap_block_free(heap, block);
|
|
} else {
|
|
/* Avoid a bogus UNIV_MEM_ASSERT_W() warning in a
|
|
subsequent invocation of mem_heap_free_top().
|
|
Originally, this was UNIV_MEM_FREE(), to catch writes
|
|
to freed memory. */
|
|
UNIV_MEM_ALLOC((byte*) block + mem_block_get_free(block), n);
|
|
}
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
NOTE: Use the corresponding macros instead of this function. Creates a
|
|
memory heap. For debugging purposes, takes also the file name and line as
|
|
argument.
|
|
@return own: memory heap, NULL if did not succeed (only possible for
|
|
MEM_HEAP_BTR_SEARCH type heaps) */
|
|
UNIV_INLINE
|
|
mem_heap_t*
|
|
mem_heap_create_func(
|
|
/*=================*/
|
|
ulint n, /*!< in: desired start block size,
|
|
this means that a single user buffer
|
|
of size n will fit in the block,
|
|
0 creates a default size block */
|
|
ulint type, /*!< in: heap type */
|
|
const char* file_name, /*!< in: file name where created */
|
|
ulint line) /*!< in: line where created */
|
|
{
|
|
mem_block_t* block;
|
|
|
|
if (!n) {
|
|
n = MEM_BLOCK_START_SIZE;
|
|
}
|
|
|
|
block = mem_heap_create_block(NULL, n, type, file_name, line);
|
|
|
|
if (block == NULL) {
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
UT_LIST_INIT(block->base);
|
|
|
|
/* Add the created block itself as the first block in the list */
|
|
UT_LIST_ADD_FIRST(list, block->base, block);
|
|
|
|
#ifdef UNIV_MEM_DEBUG
|
|
|
|
mem_hash_insert(block, file_name, line);
|
|
|
|
#endif
|
|
|
|
return(block);
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
NOTE: Use the corresponding macro instead of this function. Frees the space
|
|
occupied by a memory heap. In the debug version erases the heap memory
|
|
blocks. */
|
|
UNIV_INLINE
|
|
void
|
|
mem_heap_free_func(
|
|
/*===============*/
|
|
mem_heap_t* heap, /*!< in, own: heap to be freed */
|
|
const char* file_name __attribute__((unused)),
|
|
/*!< in: file name where freed */
|
|
ulint line __attribute__((unused)))
|
|
{
|
|
mem_block_t* block;
|
|
mem_block_t* prev_block;
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
block = UT_LIST_GET_LAST(heap->base);
|
|
|
|
#ifdef UNIV_MEM_DEBUG
|
|
|
|
/* In the debug version remove the heap from the hash table of heaps
|
|
and check its consistency */
|
|
|
|
mem_hash_remove(heap, file_name, line);
|
|
|
|
#endif
|
|
#ifndef UNIV_HOTBACKUP
|
|
if (heap->free_block) {
|
|
mem_heap_free_block_free(heap);
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
while (block != NULL) {
|
|
/* Store the contents of info before freeing current block
|
|
(it is erased in freeing) */
|
|
|
|
prev_block = UT_LIST_GET_PREV(list, block);
|
|
|
|
mem_heap_block_free(heap, block);
|
|
|
|
block = prev_block;
|
|
}
|
|
}
|
|
|
|
/***************************************************************//**
|
|
NOTE: Use the corresponding macro instead of this function.
|
|
Allocates a single buffer of memory from the dynamic memory of
|
|
the C compiler. Is like malloc of C. The buffer must be freed
|
|
with mem_free.
|
|
@return own: free storage */
|
|
UNIV_INLINE
|
|
void*
|
|
mem_alloc_func(
|
|
/*===========*/
|
|
ulint n, /*!< in: desired number of bytes */
|
|
ulint* size, /*!< out: allocated size in bytes,
|
|
or NULL */
|
|
const char* file_name, /*!< in: file name where created */
|
|
ulint line) /*!< in: line where created */
|
|
{
|
|
mem_heap_t* heap;
|
|
void* buf;
|
|
|
|
heap = mem_heap_create_func(n, MEM_HEAP_DYNAMIC, file_name, line);
|
|
|
|
/* Note that as we created the first block in the heap big enough
|
|
for the buffer requested by the caller, the buffer will be in the
|
|
first block and thus we can calculate the pointer to the heap from
|
|
the pointer to the buffer when we free the memory buffer. */
|
|
|
|
if (UNIV_LIKELY_NULL(size)) {
|
|
/* Adjust the allocation to the actual size of the
|
|
memory block. */
|
|
ulint m = mem_block_get_len(heap)
|
|
- mem_block_get_free(heap);
|
|
#ifdef UNIV_MEM_DEBUG
|
|
m -= MEM_FIELD_HEADER_SIZE + MEM_FIELD_TRAILER_SIZE;
|
|
#endif /* UNIV_MEM_DEBUG */
|
|
ut_ad(m >= n);
|
|
*size = n = m;
|
|
}
|
|
|
|
buf = mem_heap_alloc(heap, n);
|
|
|
|
ut_a((byte*)heap == (byte*)buf - MEM_BLOCK_HEADER_SIZE
|
|
- MEM_FIELD_HEADER_SIZE);
|
|
return(buf);
|
|
}
|
|
|
|
/***************************************************************//**
|
|
NOTE: Use the corresponding macro instead of this function. Frees a single
|
|
buffer of storage from the dynamic memory of the C compiler. Similar to the
|
|
free of C. */
|
|
UNIV_INLINE
|
|
void
|
|
mem_free_func(
|
|
/*==========*/
|
|
void* ptr, /*!< in, own: buffer to be freed */
|
|
const char* file_name, /*!< in: file name where created */
|
|
ulint line) /*!< in: line where created */
|
|
{
|
|
mem_heap_t* heap;
|
|
|
|
heap = (mem_heap_t*)((byte*)ptr - MEM_BLOCK_HEADER_SIZE
|
|
- MEM_FIELD_HEADER_SIZE);
|
|
mem_heap_free_func(heap, file_name, line);
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
Returns the space in bytes occupied by a memory heap. */
|
|
UNIV_INLINE
|
|
ulint
|
|
mem_heap_get_size(
|
|
/*==============*/
|
|
mem_heap_t* heap) /*!< in: heap */
|
|
{
|
|
ulint size = 0;
|
|
|
|
ut_ad(mem_heap_check(heap));
|
|
|
|
size = heap->total_size;
|
|
|
|
#ifndef UNIV_HOTBACKUP
|
|
if (heap->free_block) {
|
|
size += UNIV_PAGE_SIZE;
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
return(size);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Duplicates a NUL-terminated string.
|
|
@return own: a copy of the string, must be deallocated with mem_free */
|
|
UNIV_INLINE
|
|
char*
|
|
mem_strdup(
|
|
/*=======*/
|
|
const char* str) /*!< in: string to be copied */
|
|
{
|
|
ulint len = strlen(str) + 1;
|
|
return((char*) memcpy(mem_alloc(len), str, len));
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Makes a NUL-terminated copy of a nonterminated string.
|
|
@return own: a copy of the string, must be deallocated with mem_free */
|
|
UNIV_INLINE
|
|
char*
|
|
mem_strdupl(
|
|
/*========*/
|
|
const char* str, /*!< in: string to be copied */
|
|
ulint len) /*!< in: length of str, in bytes */
|
|
{
|
|
char* s = (char*) mem_alloc(len + 1);
|
|
s[len] = 0;
|
|
return((char*) memcpy(s, str, len));
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Makes a NUL-terminated copy of a nonterminated string,
|
|
allocated from a memory heap.
|
|
@return own: a copy of the string */
|
|
UNIV_INLINE
|
|
char*
|
|
mem_heap_strdupl(
|
|
/*=============*/
|
|
mem_heap_t* heap, /*!< in: memory heap where string is allocated */
|
|
const char* str, /*!< in: string to be copied */
|
|
ulint len) /*!< in: length of str, in bytes */
|
|
{
|
|
char* s = (char*) mem_heap_alloc(heap, len + 1);
|
|
s[len] = 0;
|
|
return((char*) memcpy(s, str, len));
|
|
}
|