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
508522e5
Commit
508522e5
authored
Jul 14, 2010
by
Marc Alff
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented code review comments.
Fixed style according to the specific innodb style, for innodb code.
parent
adf29ed6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
23 deletions
+22
-23
storage/innobase/include/os0file.ic
storage/innobase/include/os0file.ic
+10
-10
storage/innobase/include/sync0rw.ic
storage/innobase/include/sync0rw.ic
+8
-9
storage/innobase/row/row0merge.c
storage/innobase/row/row0merge.c
+4
-4
No files found.
storage/innobase/include/os0file.ic
View file @
508522e5
...
...
@@ -55,7 +55,7 @@ pfs_os_file_create_simple_func(
{
os_file_t file;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
/* register a file open or creation depending on "create_mode" */
register_pfs_file_open_begin(&state, locker, key,
...
...
@@ -102,7 +102,7 @@ pfs_os_file_create_simple_no_error_handling_func(
{
os_file_t file;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
/* register a file open or creation depending on "create_mode" */
register_pfs_file_open_begin(&state, locker, key,
...
...
@@ -155,7 +155,7 @@ pfs_os_file_create_func(
{
os_file_t file;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
/* register a file open or creation depending on "create_mode" */
register_pfs_file_open_begin(&state, locker, key,
...
...
@@ -186,7 +186,7 @@ pfs_os_file_close_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
/* register the file close */
register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_CLOSE,
...
...
@@ -234,7 +234,7 @@ pfs_os_aio_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
/* Register the read or write I/O depending on "type" */
register_pfs_file_io_begin(&state, locker, file, n,
...
...
@@ -273,7 +273,7 @@ pfs_os_file_read_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_READ,
src_file, src_line);
...
...
@@ -309,7 +309,7 @@ pfs_os_file_read_no_error_handling_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_READ,
src_file, src_line);
...
...
@@ -346,7 +346,7 @@ pfs_os_file_write_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_WRITE,
src_file, src_line);
...
...
@@ -374,7 +374,7 @@ pfs_os_file_flush_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_SYNC,
src_file, src_line);
...
...
@@ -404,7 +404,7 @@ pfs_os_file_rename_func(
{
ibool result;
struct PSI_file_locker* locker = NULL;
PSI_file_locker_state
state;
PSI_file_locker_state
state;
register_pfs_file_open_begin(&state, locker, key, PSI_FILE_RENAME, newpath,
src_file, src_line);
...
...
storage/innobase/include/sync0rw.ic
View file @
508522e5
...
...
@@ -675,8 +675,8 @@ pfs_rw_lock_x_lock_func(
const char* file_name,/*!< in: file name where lock requested */
ulint line) /*!< in: line where requested */
{
struct PSI_rwlock_locker*
locker = NULL;
PSI_rwlock_locker_state
state;
struct PSI_rwlock_locker*
locker = NULL;
PSI_rwlock_locker_state
state;
/* Record the entry of rw x lock request in performance schema */
if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) {
...
...
@@ -710,8 +710,8 @@ pfs_rw_lock_x_lock_func_nowait(
requested */
ulint line) /*!< in: line where requested */
{
struct PSI_rwlock_locker*
locker = NULL;
PSI_rwlock_locker_state
state;
struct PSI_rwlock_locker*
locker = NULL;
PSI_rwlock_locker_state
state;
ibool ret;
/* Record the entry of rw x lock request in performance schema */
...
...
@@ -766,8 +766,8 @@ pfs_rw_lock_s_lock_func(
requested */
ulint line) /*!< in: line where requested */
{
struct PSI_rwlock_locker*
locker = NULL;
PSI_rwlock_locker_state
state;
struct PSI_rwlock_locker*
locker = NULL;
PSI_rwlock_locker_state
state;
/* Instrumented to inform we are aquiring a shared rwlock */
if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) {
...
...
@@ -801,9 +801,8 @@ pfs_rw_lock_s_lock_low(
const char* file_name, /*!< in: file name where lock requested */
ulint line) /*!< in: line where requested */
{
struct PSI_rwlock_locker* locker = NULL;
PSI_rwlock_locker_state state;
struct PSI_rwlock_locker* locker = NULL;
PSI_rwlock_locker_state state;
ibool ret;
/* Instrumented to inform we are aquiring a shared rwlock */
...
...
storage/innobase/row/row0merge.c
View file @
508522e5
...
...
@@ -2164,8 +2164,8 @@ row_merge_file_create(
/* This temp file open does not go through normal
file APIs, add instrumentation to register with
performance schema */
struct
PSI_file_locker
*
locker
=
NULL
;
PSI_file_locker_state
state
;
struct
PSI_file_locker
*
locker
=
NULL
;
PSI_file_locker_state
state
;
register_pfs_file_open_begin
(
&
state
,
locker
,
innodb_file_temp_key
,
PSI_FILE_OPEN
,
"Innodb Merge Temp File"
,
...
...
@@ -2188,8 +2188,8 @@ row_merge_file_destroy(
merge_file_t
*
merge_file
)
/*!< out: merge file structure */
{
#ifdef UNIV_PFS_IO
struct
PSI_file_locker
*
locker
=
NULL
;
PSI_file_locker_state
state
;
struct
PSI_file_locker
*
locker
=
NULL
;
PSI_file_locker_state
state
;
register_pfs_file_io_begin
(
&
state
,
locker
,
merge_file
->
fd
,
0
,
PSI_FILE_CLOSE
,
__FILE__
,
__LINE__
);
#endif
...
...
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