Skip to content

M
MariaDB
Commit 8420d4b6 authored by marko's avatar marko
Browse files
Options

branches/zip: Add the buf_pool->zip_free[] accessor functions 

buf_buddy_add_to_free() and buf_buddy_remove_from_free().
Remove some bogus Valgrind warnings.  Improve Valgrind instrumentation.
parent 5637695a
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 29 deletions
buf/buf0buddy.c
View file @ 8420d4b6
...@@ -39,6 +39,56 @@ buf_buddy_get( ...@@ -39,6 +39,56 @@ buf_buddy_get(
} }
} }
/**************************************************************************
Add a block to the head of the appropriate buddy free list. */
UNIV_INLINE
void
buf_buddy_add_to_free(
/*==================*/
buf_page_t* bpage, /* in,own: block to be freed */
ulint i) /* in: index of buf_pool->zip_free[] */
{
#ifdef UNIV_DEBUG_VALGRIND
buf_page_t* b = UT_LIST_GET_FIRST(buf_pool->zip_free[i]);
if (b) UNIV_MEM_VALID(b, BUF_BUDDY_LOW << i);
#endif /* UNIV_DEBUG_VALGRIND */
ut_ad(buf_pool->zip_free[i].start != bpage);
UT_LIST_ADD_FIRST(list, buf_pool->zip_free[i], bpage);
#ifdef UNIV_DEBUG_VALGRIND
if (b) UNIV_MEM_FREE(b, BUF_BUDDY_LOW << i);
UNIV_MEM_FREE(bpage, BUF_BUDDY_LOW << i);
#endif /* UNIV_DEBUG_VALGRIND */
}
/**************************************************************************
Remove a block from the appropriate buddy free list. */
UNIV_INLINE
void
buf_buddy_remove_from_free(
/*=======================*/
buf_page_t* bpage, /* in: block to be removed */
ulint i) /* in: index of buf_pool->zip_free[] */
{
#ifdef UNIV_DEBUG_VALGRIND
buf_page_t* prev = UT_LIST_GET_PREV(list, bpage);
buf_page_t* next = UT_LIST_GET_NEXT(list, bpage);
if (prev) UNIV_MEM_VALID(prev, BUF_BUDDY_LOW << i);
if (next) UNIV_MEM_VALID(next, BUF_BUDDY_LOW << i);
#endif /* UNIV_DEBUG_VALGRIND */
ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE);
UT_LIST_REMOVE(list, buf_pool->zip_free[i], bpage);
#ifdef UNIV_DEBUG_VALGRIND
if (prev) UNIV_MEM_FREE(prev, BUF_BUDDY_LOW << i);
if (next) UNIV_MEM_FREE(next, BUF_BUDDY_LOW << i);
#endif /* UNIV_DEBUG_VALGRIND */
}
/************************************************************************** /**************************************************************************
Try to allocate a block from buf_pool->zip_free[]. */ Try to allocate a block from buf_pool->zip_free[]. */
static static
...@@ -66,7 +116,7 @@ buf_buddy_alloc_zip( ...@@ -66,7 +116,7 @@ buf_buddy_alloc_zip(
UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i);
ut_a(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE); ut_a(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE);
UT_LIST_REMOVE(list, buf_pool->zip_free[i], bpage); buf_buddy_remove_from_free(bpage, i);
} else if (i + 1 < BUF_BUDDY_SIZES) { } else if (i + 1 < BUF_BUDDY_SIZES) {
/* Attempt to split. */ /* Attempt to split. */
bpage = buf_buddy_alloc_zip(i + 1); bpage = buf_buddy_alloc_zip(i + 1);
...@@ -78,9 +128,7 @@ buf_buddy_alloc_zip( ...@@ -78,9 +128,7 @@ buf_buddy_alloc_zip(
ut_ad(!buf_pool_contains_zip(buddy)); ut_ad(!buf_pool_contains_zip(buddy));
ut_d(memset(buddy, i, BUF_BUDDY_LOW << i)); ut_d(memset(buddy, i, BUF_BUDDY_LOW << i));
buddy->state = BUF_BLOCK_ZIP_FREE; buddy->state = BUF_BLOCK_ZIP_FREE;
ut_ad(buf_pool->zip_free[i].start != buddy); buf_buddy_add_to_free(buddy, i);
UT_LIST_ADD_FIRST(list, buf_pool->zip_free[i], buddy);
UNIV_MEM_FREE(buddy, BUF_BUDDY_LOW << i);
} }
} }
...@@ -166,9 +214,6 @@ buf_buddy_alloc_from( ...@@ -166,9 +214,6 @@ buf_buddy_alloc_from(
/* Add the unused parts of the block to the free lists. */ /* Add the unused parts of the block to the free lists. */
while (j > i) { while (j > i) {
buf_page_t* bpage; buf_page_t* bpage;
#ifdef UNIV_DEBUG_VALGRIND
buf_page_t* b;
#endif /* UNIV_DEBUG_VALGRIND */
offs >>= 1; offs >>= 1;
j--; j--;
...@@ -179,17 +224,8 @@ buf_buddy_alloc_from( ...@@ -179,17 +224,8 @@ buf_buddy_alloc_from(
#if defined UNIV_DEBUG && !defined UNIV_DEBUG_VALGRIND #if defined UNIV_DEBUG && !defined UNIV_DEBUG_VALGRIND
/* Valgrind would complain about accessing free memory. */ /* Valgrind would complain about accessing free memory. */
UT_LIST_VALIDATE(list, buf_page_t, buf_pool->zip_free[j]); UT_LIST_VALIDATE(list, buf_page_t, buf_pool->zip_free[j]);
ut_ad(buf_pool->zip_free[j].start != bpage);
#endif /* UNIV_DEBUG && !UNIV_DEBUG_VALGRIND */ #endif /* UNIV_DEBUG && !UNIV_DEBUG_VALGRIND */
#ifdef UNIV_DEBUG_VALGRIND buf_buddy_add_to_free(bpage, j);
b = UT_LIST_GET_FIRST(buf_pool->zip_free[j]);
if (b) UNIV_MEM_VALID(b, BUF_BUDDY_LOW << j);
#endif /* UNIV_DEBUG_VALGRIND */
UT_LIST_ADD_FIRST(list, buf_pool->zip_free[j], bpage);
#ifdef UNIV_DEBUG_VALGRIND
if (b) UNIV_MEM_FREE(b, BUF_BUDDY_LOW << j);
#endif /* UNIV_DEBUG_VALGRIND */
UNIV_MEM_FREE(bpage, BUF_BUDDY_LOW << j);
} }
return(buf); return(buf);
...@@ -513,7 +549,10 @@ buf_buddy_free_low( ...@@ -513,7 +549,10 @@ buf_buddy_free_low(
ut_a(!mutex_own(&buf_pool->zip_mutex)); ut_a(!mutex_own(&buf_pool->zip_mutex));
#endif /* UNIV_SYNC_DEBUG */ #endif /* UNIV_SYNC_DEBUG */
recombine: recombine:
#ifdef UNIV_DEBUG_VALGRIND
VALGRIND_CHECK_MEM_IS_ADDRESSABLE(buf, BUF_BUDDY_LOW << i);
UNIV_MEM_INVALID(buf, BUF_BUDDY_LOW << i); UNIV_MEM_INVALID(buf, BUF_BUDDY_LOW << i);
#endif /* UNIV_DEBUG_VALGRIND */
ut_d(((buf_page_t*) buf)->state = BUF_BLOCK_ZIP_FREE); ut_d(((buf_page_t*) buf)->state = BUF_BLOCK_ZIP_FREE);
if (i == BUF_BUDDY_SIZES) { if (i == BUF_BUDDY_SIZES) {
...@@ -542,15 +581,14 @@ buf_buddy_free_low( ...@@ -542,15 +581,14 @@ buf_buddy_free_low(
it is in the free list. */ it is in the free list. */
#endif /* !UNIV_DEBUG_VALGRIND */ #endif /* !UNIV_DEBUG_VALGRIND */
for (bpage = UT_LIST_GET_FIRST(buf_pool->zip_free[i]); for (bpage = UT_LIST_GET_FIRST(buf_pool->zip_free[i]); bpage; ) {
bpage; bpage = UT_LIST_GET_NEXT(list, bpage)) {
UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i); UNIV_MEM_VALID(bpage, BUF_BUDDY_LOW << i);
ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE); ut_ad(buf_page_get_state(bpage) == BUF_BLOCK_ZIP_FREE);
if (bpage == buddy) { if (bpage == buddy) {
buddy_free: buddy_free:
/* The buddy is free: recombine */ /* The buddy is free: recombine */
UT_LIST_REMOVE(list, buf_pool->zip_free[i], bpage); buf_buddy_remove_from_free(bpage, i);
buddy_free2: buddy_free2:
ut_ad(buf_page_get_state(buddy) == BUF_BLOCK_ZIP_FREE); ut_ad(buf_page_get_state(buddy) == BUF_BLOCK_ZIP_FREE);
ut_ad(!buf_pool_contains_zip(buddy)); ut_ad(!buf_pool_contains_zip(buddy));
...@@ -560,8 +598,13 @@ buf_buddy_free_low( ...@@ -560,8 +598,13 @@ buf_buddy_free_low(
goto recombine; goto recombine;
} }
UNIV_MEM_FREE(bpage, BUF_BUDDY_LOW << i);
ut_a(bpage != buf); ut_a(bpage != buf);
{
buf_page_t* next = UT_LIST_GET_NEXT(list, bpage);
UNIV_MEM_FREE(bpage, BUF_BUDDY_LOW << i);
bpage = next;
}
} }
#ifndef UNIV_DEBUG_VALGRIND #ifndef UNIV_DEBUG_VALGRIND
...@@ -579,7 +622,7 @@ buf_buddy_free_low( ...@@ -579,7 +622,7 @@ buf_buddy_free_low(
UNIV_MEM_ALLOC(bpage, BUF_BUDDY_LOW << i); UNIV_MEM_ALLOC(bpage, BUF_BUDDY_LOW << i);
UNIV_MEM_VALID(&bpage->list, sizeof bpage->list); UNIV_MEM_VALID(&bpage->list, sizeof bpage->list);
UT_LIST_REMOVE(list, buf_pool->zip_free[i], bpage); buf_buddy_remove_from_free(bpage, i);
/* Try to relocate the buddy of buf to the free block. */ /* Try to relocate the buddy of buf to the free block. */
if (buf_buddy_relocate(buddy, bpage, i)) { if (buf_buddy_relocate(buddy, bpage, i)) {
...@@ -588,15 +631,15 @@ buf_buddy_free_low( ...@@ -588,15 +631,15 @@ buf_buddy_free_low(
goto buddy_free2; goto buddy_free2;
} }
UT_LIST_ADD_FIRST(list, buf_pool->zip_free[i], bpage); buf_buddy_add_to_free(bpage, i);
UNIV_MEM_FREE(bpage, BUF_BUDDY_LOW << i);
/* Try to relocate the buddy of the free block to buf. */ /* Try to relocate the buddy of the free block to buf. */
buddy = (buf_page_t*) buf_buddy_get(((byte*) bpage), buddy = (buf_page_t*) buf_buddy_get(((byte*) bpage),
BUF_BUDDY_LOW << i); BUF_BUDDY_LOW << i);
#if defined UNIV_DEBUG && !defined UNIV_DEBUG_VALGRIND #ifdef UNIV_DEBUG_VALGRIND
/* Valgrind would complain about accessing free memory. */ VALGRIND_CHECK_MEM_IS_ADDRESSABLE(buddy, BUF_BUDDY_LOW << i);
#elif defined UNIV_DEBUG
{ {
const buf_page_t* b; const buf_page_t* b;
...@@ -671,8 +714,6 @@ buf_buddy_free_low( ...@@ -671,8 +714,6 @@ buf_buddy_free_low(
memset(bpage, i, BUF_BUDDY_LOW << i); memset(bpage, i, BUF_BUDDY_LOW << i);
} }
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
UNIV_MEM_FREE(buf, BUF_BUDDY_LOW << i);
bpage->state = BUF_BLOCK_ZIP_FREE; bpage->state = BUF_BLOCK_ZIP_FREE;
ut_ad(buf_pool->zip_free[i].start != bpage); buf_buddy_add_to_free(bpage, i);
UT_LIST_ADD_FIRST(list, buf_pool->zip_free[i], bpage);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7