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
15c7f684
Commit
15c7f684
authored
Nov 15, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16264: Minor cleanup
Add missing static qualifiers.
parent
a69cff29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
18 deletions
+18
-18
storage/innobase/include/os0file.h
storage/innobase/include/os0file.h
+4
-5
storage/innobase/os/os0file.cc
storage/innobase/os/os0file.cc
+14
-13
No files found.
storage/innobase/include/os0file.h
View file @
15c7f684
...
...
@@ -1360,14 +1360,13 @@ os_aio_init(
/**
Frees the asynchronous io system. */
void
os_aio_free
();
void
os_aio_free
();
struct
os_aio_userdata_t
{
fil_node_t
*
node
;
IORequest
type
;
void
*
message
;
fil_node_t
*
node
;
IORequest
type
;
void
*
message
;
};
/**
NOTE! Use the corresponding macro os_aio(), not directly this function!
...
...
storage/innobase/os/os0file.cc
View file @
15c7f684
...
...
@@ -123,12 +123,12 @@ class io_slots
}
};
io_slots
*
read_slots
;
io_slots
*
write_slots
;
io_slots
*
ibuf_slots
;
static
io_slots
*
read_slots
;
static
io_slots
*
write_slots
;
static
io_slots
*
ibuf_slots
;
/** Number of retries for partial I/O's */
static
const
ulint
NUM_RETRIES_ON_PARTIAL_IO
=
10
;
constexpr
ulint
NUM_RETRIES_ON_PARTIAL_IO
=
10
;
/* This specifies the file permissions InnoDB uses when it creates files in
Unix; the value of os_innodb_umask is initialized in ha_innodb.cc to
...
...
@@ -4047,24 +4047,25 @@ bool os_aio_init(ulint n_reader_threads, ulint n_writer_threads, ulint)
return
true
;
}
void
os_aio_free
(
void
)
void
os_aio_free
()
{
srv_thread_pool
->
disable_aio
();
delete
read_slots
;
delete
write_slots
;
delete
ibuf_slots
;
srv_thread_pool
->
disable_aio
();
delete
read_slots
;
delete
write_slots
;
delete
ibuf_slots
;
read_slots
=
nullptr
;
write_slots
=
nullptr
;
ibuf_slots
=
nullptr
;
}
/** Waits until there are no pending writes. There can
be other, synchronous, pending writes. */
void
os_aio_wait_until_no_pending_writes
()
void
os_aio_wait_until_no_pending_writes
()
{
write_slots
->
wait
();
write_slots
->
wait
();
}
/**
NOTE! Use the corresponding macro os_aio(), not directly this function!
Requests an asynchronous i/o operation.
...
...
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