1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed debug label XXX in ma_pagecache.cc XXX to proper lables

Browse Source
This commit is contained in:
Monty 2020-04-26 15:28:03 +03:00
parent 82d2dc9027
commit 7cb160961c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
storage/maria/ma_pagecache.c
View File

@ -1373,8 +1373,8 @@ static void link_block(PAGECACHE *pagecache, PAGECACHE_BLOCK_LINK *block,
}
}
while (thread != last_thread);
DBUG_PRINT("XXX", ("hash_link (link block): %p, hash_link: %p -> %p",
hash_link, hash_link->block, block));
DBUG_PRINT("hash", ("hash_link (link block): %p, hash_link: %p -> %p",
hash_link, hash_link->block, block));
hash_link->block= block;
/* Ensure that no other thread tries to use this block */
block->status|= PCBLOCK_REASSIGNED;
@ -1662,8 +1662,8 @@ static inline void link_hash(PAGECACHE_HASH_LINK **start,
static void unlink_hash(PAGECACHE *pagecache, PAGECACHE_HASH_LINK *hash_link)
{
DBUG_ENTER("unlink_hash");
DBUG_PRINT("enter", ("hash_link: %p fd: %u pos: %lu requests: %u",
hash_link, (uint) hash_link->file.file,
DBUG_PRINT("enter", ("hash_link: %p block: %p fd: %u pos: %lu requests: %u",
hash_link, hash_link->block, (uint) hash_link->file.file,
(ulong) hash_link->pageno,
hash_link->requests));
DBUG_ASSERT(hash_link->requests == 0);
@ -1672,8 +1672,6 @@ static void unlink_hash(PAGECACHE *pagecache, PAGECACHE_HASH_LINK *hash_link)
if ((*hash_link->prev= hash_link->next))
hash_link->next->prev= hash_link->prev;
DBUG_PRINT("XXX", ("hash_link (unlink): %p, hash_link: %p -> NULL",
hash_link, hash_link->block));
hash_link->block= NULL;
if (pagecache->waiting_for_hash_link.last_thread)
{
@ -2048,11 +2046,11 @@ restart:
/* This is a request for a new page or for a page not to be removed */
if (! block)
{
DBUG_PRINT("XXX", ("request for a new page"));
DBUG_PRINT("info", ("request for a new page"));
/* No block is assigned for the page yet */
if (pagecache->blocks_unused)
{
DBUG_PRINT("XXX", ("there is never used blocks"));
DBUG_PRINT("info", ("there is never used blocks"));
if (pagecache->free_block_list)
{
/* There is a block in the free list. */
@ -2086,11 +2084,13 @@ restart:
block->last_hit_time= 0;
block->rec_lsn= LSN_MAX;
link_to_file_list(pagecache, block, file, 0);
DBUG_PRINT("XXX", ("block (no block assigned): %p, hash_link: %p -> %p",
block, block->hash_link, hash_link));
DBUG_PRINT("hash",
("block (no block assigned): %p hash_link: %p -> %p",
block, block->hash_link, hash_link));
block->hash_link= hash_link;
DBUG_PRINT("XXX", ("hash_link (no block assignment): %p, hash_link: %p -> %p",
hash_link, hash_link->block, block));
DBUG_PRINT("hash",
("hash_link (no block assignment): %p hash_link: %p -> %p",
hash_link, hash_link->block, block));
hash_link->block= block;
page_status= PAGE_TO_BE_READ;
DBUG_PRINT("info", ("page to be read set for page %p (%u)",
@ -2101,7 +2101,7 @@ restart:
}
else
{
DBUG_PRINT("XXX", ("there is NOT never used blocks"));
DBUG_PRINT("info", ("there is NOT never used blocks"));
/* There are no never used blocks, use a block from the LRU chain */
/*
@ -2114,7 +2114,7 @@ restart:
if (! pagecache->used_last)
{
struct st_my_thread_var *thread;
DBUG_PRINT("XXX", ("there is NOT UNUSED blocks"));
DBUG_PRINT("info", ("there is NOT UNUSED blocks"));
/*
Wait until a new block is added to the LRU chain;
several threads might wait here for the same page,
@ -2153,7 +2153,7 @@ restart:
}
else
{
DBUG_PRINT("XXX", ("take a block from LRU"));
DBUG_PRINT("info", ("take a block from LRU"));
/*
Take the first block from the LRU chain
unlinking it from the chain
@ -2175,8 +2175,8 @@ restart:
}
if (reg_req)
reg_requests(pagecache, block, 1);
DBUG_PRINT("XXX", ("hash_link (LRU): %p, hash_link: %p -> %p",
hash_link, hash_link->block, block));
DBUG_PRINT("hash", ("hash_link (LRU): %p, hash_link: %p -> %p",
hash_link, hash_link->block, block));
hash_link->block= block;
DBUG_ASSERT(block->requests == 1);
}
@ -2247,8 +2247,8 @@ restart:
link_to_file_list(pagecache, block, file,
(my_bool)(block->hash_link ? 1 : 0));
DBUG_PRINT("XXX", ("block (LRU): %p, hash_link: %p -> %p",
block, block->hash_link, hash_link));
DBUG_PRINT("hash", ("block (LRU): %p, hash_link: %p -> %p",
block, block->hash_link, hash_link));
block->hash_link= hash_link;
PCBLOCK_INFO(block);
block->hits_left= init_hits_left;
@ -4602,8 +4602,8 @@ static my_bool free_block(PAGECACHE *pagecache, PAGECACHE_BLOCK_LINK *block,
block->type= PAGECACHE_EMPTY_PAGE;
#endif
block->rec_lsn= LSN_MAX;
DBUG_PRINT("XXX", ("block (Free): %p, hash_link: %p -> NULL",
block, block->hash_link));
DBUG_PRINT("hash", ("block (Free): %p, hash_link: %p -> NULL",
block, block->hash_link));
block->hash_link= NULL;
if (block->temperature == PCBLOCK_WARM)
pagecache->warm_blocks--;