mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: buf_buddy_free_low(): When trying to relocate to a block on

Browse source 
the free list, remove the free block from the free list, so that the list
item pointers will not be overwritten.
This commit is contained in:
marko 2006-12-20 13:29:02 +00:00
parent 2c6685709b
commit a03c082c8f
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
buf/buf0buddy.c
View file

@ -465,8 +465,9 @@ recombine:
if (bpage == buddy) {
buddy_free:
/* The buddy is free: recombine */
ut_ad(!buf_pool_contains_zip(buddy));
UT_LIST_REMOVE(list, buf_pool->zip_free[i], bpage);
buddy_free2:
ut_ad(!buf_pool_contains_zip(buddy));
buf = ut_align_down(buf, BUF_BUDDY_LOW << (i + 1));
if (++i < BUF_BUDDY_SIZES) {
@ -489,12 +490,19 @@ buddy_nonfree:
bpage = UT_LIST_GET_FIRST(buf_pool->zip_free[i]);
if (bpage) {
/* Remove the block from the free list, because a successful
buf_buddy_relocate() will overwrite bpage->list. */
UT_LIST_REMOVE(list, buf_pool->zip_free[i], bpage);
/* Try to relocate the buddy of buf to the free block. */
if (buf_buddy_relocate(buddy, bpage, i)) {
goto buddy_free;
goto buddy_free2;
}
UT_LIST_ADD_FIRST(list, buf_pool->zip_free[i], bpage);
/* Try to relocate the buddy of the free block to buf. */
buddy = (buf_page_t*) buf_buddy_get(((byte*) bpage),
BUF_BUDDY_LOW << i);