diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-18 21:48:00 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-18 22:32:40 +0200 |
commit | a786f50de5ce17748d851cf4264399c277d61925 (patch) | |
tree | 8a107091cec37ee88a58ebbffb2bcd0fa4ceb241 /storage/innobase/include/buf0buddy.h | |
parent | e0eacbee77fd56255d1073d7cb3e738b7de0285c (diff) | |
download | mariadb-git-a786f50de5ce17748d851cf4264399c277d61925.tar.gz |
MDEV-21962 Allocate buf_pool statically
Thanks to MDEV-15058, there is only one InnoDB buffer pool.
Allocating buf_pool statically removes one level of pointer indirection
and makes code more readable, and removes the awkward initialization of
some buf_pool members.
While doing this, we will also declare some buf_pool_t data members
private and replace some functions with member functions. This is
mostly affecting buffer pool resizing.
This is not aiming to be a complete rewrite of buf_pool_t to
a proper class. Most of the buffer pool interface, such as
buf_page_get_gen(), will remain in the C programming style
for now.
buf_pool_t::withdrawing: Replaces buf_pool_withdrawing.
buf_pool_t::withdraw_clock_: Replaces buf_withdraw_clock.
buf_pool_t::create(): Repalces buf_pool_init().
buf_pool_t::close(): Replaces buf_pool_free().
buf_bool_t::will_be_withdrawn(): Replaces buf_block_will_be_withdrawn(),
buf_frame_will_be_withdrawn().
buf_pool_t::clear_hash_index(): Replaces buf_pool_clear_hash_index().
buf_pool_t::get_n_pages(): Replaces buf_pool_get_n_pages().
buf_pool_t::validate(): Replaces buf_validate().
buf_pool_t::print(): Replaces buf_print().
buf_pool_t::block_from_ahi(): Replaces buf_block_from_ahi().
buf_pool_t::is_block_field(): Replaces buf_pointer_is_block_field().
buf_pool_t::is_block_mutex(): Replaces buf_pool_is_block_mutex().
buf_pool_t::is_block_lock(): Replaces buf_pool_is_block_lock().
buf_pool_t::is_obsolete(): Replaces buf_pool_is_obsolete().
buf_pool_t::io_buf: Make default-constructible.
buf_pool_t::io_buf::create(): Delayed 'constructor'
buf_pool_t::io_buf::close(): Early 'destructor'
HazardPointer: Make default-constructible. Define all member functions
inline, also for derived classes.
Diffstat (limited to 'storage/innobase/include/buf0buddy.h')
-rw-r--r-- | storage/innobase/include/buf0buddy.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h index 117e1cb8736..bd1cc06aca6 100644 --- a/storage/innobase/include/buf0buddy.h +++ b/storage/innobase/include/buf0buddy.h @@ -31,7 +31,7 @@ Created December 2006 by Marko Makela /** @param[in] block size in bytes -@return index of buf_pool->zip_free[], or BUF_BUDDY_SIZES */ +@return index of buf_pool.zip_free[], or BUF_BUDDY_SIZES */ inline ulint buf_buddy_get_slot(ulint size) @@ -50,16 +50,16 @@ buf_buddy_get_slot(ulint size) } /** Allocate a ROW_FORMAT=COMPRESSED block. -@param[in] i index of buf_pool->zip_free[] or BUF_BUDDY_SIZES -@param[out] lru whether buf_pool->mutex was temporarily released +@param[in] i index of buf_pool.zip_free[] or BUF_BUDDY_SIZES +@param[out] lru whether buf_pool.mutex was temporarily released @return allocated block, never NULL */ byte *buf_buddy_alloc_low(ulint i, bool *lru) MY_ATTRIBUTE((malloc)); /** Allocate a ROW_FORMAT=COMPRESSED block. -The caller must not hold buf_pool->mutex nor buf_pool->zip_mutex nor any +The caller must not hold buf_pool.mutex nor buf_pool.zip_mutex nor any block->mutex. @param[in] size compressed page size -@param[out] lru whether buf_pool->mutex was temporarily released +@param[out] lru whether buf_pool.mutex was temporarily released @return allocated block, never NULL */ inline byte *buf_buddy_alloc(ulint size, bool *lru= nullptr) { @@ -69,7 +69,7 @@ inline byte *buf_buddy_alloc(ulint size, bool *lru= nullptr) /** Deallocate a block. @param[in] buf block to be freed, must not be pointed to by the buffer pool -@param[in] i index of buf_pool->zip_free[], or BUF_BUDDY_SIZES */ +@param[in] i index of buf_pool.zip_free[], or BUF_BUDDY_SIZES */ void buf_buddy_free_low(void* buf, ulint i); /** Deallocate a block. |