Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b4c9cd20
Commit
b4c9cd20
authored
Jun 24, 2021
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.5 into 10.6
parents
101da872
60ed4797
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
12 deletions
+30
-12
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+2
-0
storage/innobase/buf/buf0flu.cc
storage/innobase/buf/buf0flu.cc
+8
-4
storage/innobase/buf/buf0lru.cc
storage/innobase/buf/buf0lru.cc
+18
-8
storage/innobase/include/buf0buf.h
storage/innobase/include/buf0buf.h
+2
-0
No files found.
storage/innobase/buf/buf0buf.cc
View file @
b4c9cd20
...
...
@@ -1227,6 +1227,7 @@ bool buf_pool_t::create()
pthread_cond_init
(
&
done_flush_LRU
,
nullptr
);
pthread_cond_init
(
&
done_flush_list
,
nullptr
);
pthread_cond_init
(
&
do_flush_list
,
nullptr
);
pthread_cond_init
(
&
done_free
,
nullptr
);
try_LRU_scan
=
true
;
...
...
@@ -1292,6 +1293,7 @@ void buf_pool_t::close()
pthread_cond_destroy
(
&
done_flush_LRU
);
pthread_cond_destroy
(
&
done_flush_list
);
pthread_cond_destroy
(
&
do_flush_list
);
pthread_cond_destroy
(
&
done_free
);
ut_free
(
chunks
);
chunks
=
nullptr
;
...
...
storage/innobase/buf/buf0flu.cc
View file @
b4c9cd20
...
...
@@ -392,18 +392,19 @@ void buf_page_write_complete(const IORequest &request)
reinterpret_cast
<
buf_block_t
*>
(
bpage
)
->
lock
.
u_unlock
(
true
);
if
(
request
.
is_LRU
())
{
buf_LRU_free_page
(
bpage
,
true
);
else
ut_ad
(
!
temp
);
if
(
request
.
is_LRU
())
{
ut_ad
(
buf_pool
.
n_flush_LRU_
);
if
(
!--
buf_pool
.
n_flush_LRU_
)
{
pthread_cond_broadcast
(
&
buf_pool
.
done_flush_LRU
);
pthread_cond_signal
(
&
buf_pool
.
done_free
);
}
}
else
{
ut_ad
(
!
temp
);
ut_ad
(
buf_pool
.
n_flush_list_
);
if
(
!--
buf_pool
.
n_flush_list_
)
pthread_cond_broadcast
(
&
buf_pool
.
done_flush_list
);
...
...
@@ -1676,7 +1677,10 @@ ulint buf_flush_LRU(ulint max_n)
mysql_mutex_unlock
(
&
buf_pool
.
mutex
);
if
(
!
n_flushing
)
{
pthread_cond_broadcast
(
&
buf_pool
.
done_flush_LRU
);
pthread_cond_signal
(
&
buf_pool
.
done_free
);
}
buf_dblwr
.
flush_buffered_writes
();
...
...
storage/innobase/buf/buf0lru.cc
View file @
b4c9cd20
...
...
@@ -401,7 +401,7 @@ we put it to free list to be used.
@param have_mutex whether buf_pool.mutex is already being held
@return the free control block, in state BUF_BLOCK_MEMORY */
buf_block_t
*
buf_LRU_get_free_block
(
bool
have_mutex
)
buf_block_t
*
buf_LRU_get_free_block
(
bool
have_mutex
)
{
ulint
n_iterations
=
0
;
ulint
flush_failures
=
0
;
...
...
@@ -413,6 +413,7 @@ buf_block_t* buf_LRU_get_free_block(bool have_mutex)
mysql_mutex_lock
(
&
buf_pool
.
mutex
);
got_mutex:
buf_LRU_check_size_of_non_data_objects
();
buf_block_t
*
block
;
DBUG_EXECUTE_IF
(
"ib_lru_force_no_free_page"
,
if
(
!
buf_lru_free_blocks_error_printed
)
{
...
...
@@ -421,7 +422,8 @@ buf_block_t* buf_LRU_get_free_block(bool have_mutex)
retry:
/* If there is a block in the free list, take it */
if
(
buf_block_t
*
block
=
buf_LRU_get_free_only
())
{
if
((
block
=
buf_LRU_get_free_only
())
!=
nullptr
)
{
got_block:
if
(
!
have_mutex
)
{
mysql_mutex_unlock
(
&
buf_pool
.
mutex
);
}
...
...
@@ -446,10 +448,19 @@ buf_block_t* buf_LRU_get_free_block(bool have_mutex)
buf_pool
.
try_LRU_scan
=
false
;
}
for
(;;)
{
if
((
block
=
buf_LRU_get_free_only
())
!=
nullptr
)
{
goto
got_block
;
}
if
(
!
buf_pool
.
n_flush_LRU_
)
{
break
;
}
my_cond_wait
(
&
buf_pool
.
done_free
,
&
buf_pool
.
mutex
.
m_mutex
);
}
#ifndef DBUG_OFF
not_found:
#endif
buf_flush_wait_batch_end
(
true
);
mysql_mutex_unlock
(
&
buf_pool
.
mutex
);
if
(
n_iterations
>
20
&&
!
buf_lru_free_blocks_error_printed
...
...
@@ -477,13 +488,11 @@ buf_block_t* buf_LRU_get_free_block(bool have_mutex)
}
/* No free block was found: try to flush the LRU list.
This call will flush one page from the LRU and put it on the
free list. That means that the free block is up for grabs for
all user threads.
The freed blocks will be up for grabs for all threads.
TODO: A more elegant way would have been to return
th
e freed
TODO: A more elegant way would have been to return
on
e freed
up block to the caller here but the code that deals with
removing the block from
page_hash and LRU_list
is fairly
removing the block from
buf_pool.page_hash and buf_pool.LRU
is fairly
involved (particularly in case of ROW_FORMAT=COMPRESSED pages). We
can do that in a separate patch sometime in future. */
...
...
@@ -1027,6 +1036,7 @@ buf_LRU_block_free_non_file_page(
}
else
{
UT_LIST_ADD_FIRST
(
buf_pool
.
free
,
&
block
->
page
);
ut_d
(
block
->
page
.
in_free_list
=
true
);
pthread_cond_signal
(
&
buf_pool
.
done_free
);
}
MEM_NOACCESS
(
block
->
frame
,
srv_page_size
);
...
...
storage/innobase/include/buf0buf.h
View file @
b4c9cd20
...
...
@@ -1920,6 +1920,8 @@ class buf_pool_t
UT_LIST_BASE_NODE_T
(
buf_page_t
)
free
;
/*!< base node of the free
block list */
/** signaled each time when the free list grows; protected by mutex */
pthread_cond_t
done_free
;
UT_LIST_BASE_NODE_T
(
buf_page_t
)
withdraw
;
/*!< base node of the withdraw
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment