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
1e4cb840
Commit
1e4cb840
authored
Mar 09, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
buf_page_io_complete(): Minor code cleanup
parent
aec4734f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
17 deletions
+7
-17
storage/innobase/buf/buf0buf.cc
storage/innobase/buf/buf0buf.cc
+7
-17
No files found.
storage/innobase/buf/buf0buf.cc
View file @
1e4cb840
...
...
@@ -6093,8 +6093,9 @@ buf_page_io_complete(buf_page_t* bpage, bool evict)
}
}
BPageMutex
*
block_mutex
=
buf_page_get_mutex
(
bpage
);
buf_pool_mutex_enter
(
buf_pool
);
mutex_enter
(
b
uf_page_get_mutex
(
bpage
)
);
mutex_enter
(
b
lock_mutex
);
#ifdef UNIV_IBUF_COUNT_DEBUG
if
(
io_type
==
BUF_IO_WRITE
||
uncompressed
)
{
...
...
@@ -6112,8 +6113,7 @@ buf_page_io_complete(buf_page_t* bpage, bool evict)
buf_page_set_io_fix
(
bpage
,
BUF_IO_NONE
);
buf_page_monitor
(
bpage
,
io_type
);
switch
(
io_type
)
{
case
BUF_IO_READ
:
if
(
io_type
==
BUF_IO_READ
)
{
/* NOTE that the call to ibuf may have moved the ownership of
the x-latch to this OS thread: do not let this confuse you in
debugging! */
...
...
@@ -6127,11 +6127,8 @@ buf_page_io_complete(buf_page_t* bpage, bool evict)
BUF_IO_READ
);
}
mutex_exit
(
buf_page_get_mutex
(
bpage
));
break
;
case
BUF_IO_WRITE
:
mutex_exit
(
block_mutex
);
}
else
{
/* Write means a flush operation: call the completion
routine in the flush system */
...
...
@@ -6154,18 +6151,11 @@ buf_page_io_complete(buf_page_t* bpage, bool evict)
evict
=
true
;
}
mutex_exit
(
block_mutex
);
if
(
evict
)
{
mutex_exit
(
buf_page_get_mutex
(
bpage
));
buf_LRU_free_page
(
bpage
,
true
);
}
else
{
mutex_exit
(
buf_page_get_mutex
(
bpage
));
}
break
;
default:
ut_error
;
}
DBUG_PRINT
(
"ib_buf"
,
(
"%s page %u:%u"
,
...
...
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