Skip to content

M
MariaDB
Commit 1b2b2095 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Use correct integer format with printf-like functions.

parent 8805fe0d
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
storage/innobase/buf/buf0buf.cc
View file @ 1b2b2095
...@@ -4415,7 +4415,8 @@ buf_all_freed_instance( ...@@ -4415,7 +4415,8 @@ buf_all_freed_instance(
block->page.space, block->page.space,
block->page.offset); block->page.offset);
ib_logf(IB_LOG_LEVEL_ERROR, ib_logf(IB_LOG_LEVEL_ERROR,
"Page oldest_modification %lu fix_count %d io_fix %d.", "Page oldest_modification " LSN_PF
" fix_count %d io_fix %d.",
block->page.oldest_modification, block->page.oldest_modification,
block->page.buf_fix_count, block->page.buf_fix_count,
buf_page_get_io_fix(&block->page)); buf_page_get_io_fix(&block->page));
......
storage/maria/ma_pagecache.c
View file @ 1b2b2095
...@@ -883,8 +883,8 @@ size_t init_pagecache(PAGECACHE *pagecache, size_t use_mem, ...@@ -883,8 +883,8 @@ size_t init_pagecache(PAGECACHE *pagecache, size_t use_mem,
pagecache->waiting_for_hash_link.last_thread= NULL; pagecache->waiting_for_hash_link.last_thread= NULL;
pagecache->waiting_for_block.last_thread= NULL; pagecache->waiting_for_block.last_thread= NULL;
DBUG_PRINT("exit", DBUG_PRINT("exit",
("disk_blocks: %ld block_root: 0x%lx hash_entries: %ld\ ("disk_blocks: %zu block_root: 0x%lx hash_entries: %zu\
hash_root: 0x%lx hash_links: %ld hash_link_root: 0x%lx", hash_root: 0x%lx hash_links: %zu hash_link_root: 0x%lx",
pagecache->disk_blocks, (long) pagecache->block_root, pagecache->disk_blocks, (long) pagecache->block_root,
pagecache->hash_entries, (long) pagecache->hash_root, pagecache->hash_entries, (long) pagecache->hash_root,
pagecache->hash_links, (long) pagecache->hash_link_root)); pagecache->hash_links, (long) pagecache->hash_link_root));
...@@ -1182,7 +1182,7 @@ void end_pagecache(PAGECACHE *pagecache, my_bool cleanup) ...@@ -1182,7 +1182,7 @@ void end_pagecache(PAGECACHE *pagecache, my_bool cleanup)
pagecache->blocks_changed= 0; pagecache->blocks_changed= 0;
} }
DBUG_PRINT("status", ("used: %lu changed: %lu w_requests: %lu " DBUG_PRINT("status", ("used: %zu changed: %zu w_requests: %lu "
"writes: %lu r_requests: %lu reads: %lu", "writes: %lu r_requests: %lu reads: %lu",
pagecache->blocks_used, pagecache->blocks_used,
pagecache->global_blocks_changed, pagecache->global_blocks_changed,
...@@ -1517,7 +1517,7 @@ static void unreg_request(PAGECACHE *pagecache, ...@@ -1517,7 +1517,7 @@ static void unreg_request(PAGECACHE *pagecache,
if (block->temperature == PCBLOCK_WARM) if (block->temperature == PCBLOCK_WARM)
pagecache->warm_blocks--; pagecache->warm_blocks--;
block->temperature= PCBLOCK_HOT; block->temperature= PCBLOCK_HOT;
KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %lu", KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %zu",
pagecache->warm_blocks)); pagecache->warm_blocks));
} }
link_block(pagecache, block, hot, (my_bool)at_end); link_block(pagecache, block, hot, (my_bool)at_end);
...@@ -1536,7 +1536,7 @@ static void unreg_request(PAGECACHE *pagecache, ...@@ -1536,7 +1536,7 @@ static void unreg_request(PAGECACHE *pagecache,
pagecache->warm_blocks++; pagecache->warm_blocks++;
block->temperature= PCBLOCK_WARM; block->temperature= PCBLOCK_WARM;
} }
KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %lu", KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks: %zu",
pagecache->warm_blocks)); pagecache->warm_blocks));
} }
} }
...@@ -4491,7 +4491,7 @@ static int flush_pagecache_blocks_int(PAGECACHE *pagecache, ...@@ -4491,7 +4491,7 @@ static int flush_pagecache_blocks_int(PAGECACHE *pagecache,
int rc= PCFLUSH_OK; int rc= PCFLUSH_OK;
DBUG_ENTER("flush_pagecache_blocks_int"); DBUG_ENTER("flush_pagecache_blocks_int");
DBUG_PRINT("enter", DBUG_PRINT("enter",
("fd: %d blocks_used: %lu blocks_changed: %lu type: %d", ("fd: %d blocks_used: %zu blocks_changed: %zu type: %d",
file->file, pagecache->blocks_used, pagecache->blocks_changed, file->file, pagecache->blocks_used, pagecache->blocks_changed,
type)); type));
...@@ -4956,7 +4956,7 @@ my_bool pagecache_collect_changed_blocks_with_lsn(PAGECACHE *pagecache, ...@@ -4956,7 +4956,7 @@ my_bool pagecache_collect_changed_blocks_with_lsn(PAGECACHE *pagecache,
ptr= str->str; ptr= str->str;
int8store(ptr, (ulonglong)stored_list_size); int8store(ptr, (ulonglong)stored_list_size);
ptr+= 8; ptr+= 8;
DBUG_PRINT("info", ("found %lu dirty pages", stored_list_size)); DBUG_PRINT("info", ("found %zu dirty pages", stored_list_size));
if (stored_list_size == 0) if (stored_list_size == 0)
goto end; goto end;
for (file_hash= 0; file_hash < pagecache->changed_blocks_hash_size; file_hash++) for (file_hash= 0; file_hash < pagecache->changed_blocks_hash_size; file_hash++)
......
storage/xtradb/buf/buf0buf.cc
View file @ 1b2b2095
...@@ -4694,7 +4694,8 @@ buf_all_freed_instance( ...@@ -4694,7 +4694,8 @@ buf_all_freed_instance(
block->page.space, block->page.space,
block->page.offset); block->page.offset);
ib_logf(IB_LOG_LEVEL_ERROR, ib_logf(IB_LOG_LEVEL_ERROR,
"Page oldest_modification %lu fix_count %d io_fix %d.", "Page oldest_modification " LSN_PF
" fix_count %d io_fix %d.",
block->page.oldest_modification, block->page.oldest_modification,
block->page.buf_fix_count, block->page.buf_fix_count,
buf_page_get_io_fix(&block->page)); buf_page_get_io_fix(&block->page));
......
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