1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented code review comments.

Browse Source 
Fixed style according to the specific innodb style, for innodb code.
This commit is contained in:
Marc Alff 2010-07-14 10:23:21 -06:00
parent adf29ed689
commit 508522e5f7
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
storage/innobase/include/os0file.ic
View File

@ -55,7 +55,7 @@ pfs_os_file_create_simple_func(
{ {
os_file_t file; os_file_t file;
struct PSI_file_locker* locker = NULL; 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 a file open or creation depending on "create_mode" */
register_pfs_file_open_begin(&state, locker, key, 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; os_file_t file;
struct PSI_file_locker* locker = NULL; 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 a file open or creation depending on "create_mode" */
register_pfs_file_open_begin(&state, locker, key, register_pfs_file_open_begin(&state, locker, key,
@ -155,7 +155,7 @@ pfs_os_file_create_func(
{ {
os_file_t file; os_file_t file;
struct PSI_file_locker* locker = NULL; 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 a file open or creation depending on "create_mode" */
register_pfs_file_open_begin(&state, locker, key, register_pfs_file_open_begin(&state, locker, key,
@ -186,7 +186,7 @@ pfs_os_file_close_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; struct PSI_file_locker* locker = NULL;
PSI_file_locker_state state; PSI_file_locker_state state;
/* register the file close */ /* register the file close */
register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_CLOSE, register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_CLOSE,
@ -234,7 +234,7 @@ pfs_os_aio_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; 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 the read or write I/O depending on "type" */
register_pfs_file_io_begin(&state, locker, file, n, register_pfs_file_io_begin(&state, locker, file, n,
@ -273,7 +273,7 @@ pfs_os_file_read_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; 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, register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_READ,
src_file, src_line); src_file, src_line);
@ -309,7 +309,7 @@ pfs_os_file_read_no_error_handling_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; 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, register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_READ,
src_file, src_line); src_file, src_line);
@ -346,7 +346,7 @@ pfs_os_file_write_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; 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, register_pfs_file_io_begin(&state, locker, file, n, PSI_FILE_WRITE,
src_file, src_line); src_file, src_line);
@ -374,7 +374,7 @@ pfs_os_file_flush_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; 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, register_pfs_file_io_begin(&state, locker, file, 0, PSI_FILE_SYNC,
src_file, src_line); src_file, src_line);
@ -404,7 +404,7 @@ pfs_os_file_rename_func(
{ {
ibool result; ibool result;
struct PSI_file_locker* locker = NULL; 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, register_pfs_file_open_begin(&state, locker, key, PSI_FILE_RENAME, newpath,
src_file, src_line); src_file, src_line);

17
storage/innobase/include/sync0rw.ic
View File

@ -675,8 +675,8 @@ pfs_rw_lock_x_lock_func(
const char* file_name,/*!< in: file name where lock requested */ const char* file_name,/*!< in: file name where lock requested */
ulint line) /*!< in: line where requested */ ulint line) /*!< in: line where requested */
{ {
struct PSI_rwlock_locker* locker = NULL; struct PSI_rwlock_locker* locker = NULL;
PSI_rwlock_locker_state state; PSI_rwlock_locker_state state;
/* Record the entry of rw x lock request in performance schema */ /* Record the entry of rw x lock request in performance schema */
if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) { if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) {
@ -710,8 +710,8 @@ pfs_rw_lock_x_lock_func_nowait(
requested */ requested */
ulint line) /*!< in: line where requested */ ulint line) /*!< in: line where requested */
{ {
struct PSI_rwlock_locker* locker = NULL; struct PSI_rwlock_locker* locker = NULL;
PSI_rwlock_locker_state state; PSI_rwlock_locker_state state;
ibool ret; ibool ret;
/* Record the entry of rw x lock request in performance schema */ /* Record the entry of rw x lock request in performance schema */
@ -766,8 +766,8 @@ pfs_rw_lock_s_lock_func(
requested */ requested */
ulint line) /*!< in: line where requested */ ulint line) /*!< in: line where requested */
{ {
struct PSI_rwlock_locker* locker = NULL; struct PSI_rwlock_locker* locker = NULL;
PSI_rwlock_locker_state state; PSI_rwlock_locker_state state;
/* Instrumented to inform we are aquiring a shared rwlock */ /* Instrumented to inform we are aquiring a shared rwlock */
if (UNIV_LIKELY(PSI_server && lock->pfs_psi)) { 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 */ const char* file_name, /*!< in: file name where lock requested */
ulint line) /*!< in: line where requested */ ulint line) /*!< in: line where requested */
{ {
struct PSI_rwlock_locker* locker = NULL;
struct PSI_rwlock_locker* locker = NULL; PSI_rwlock_locker_state state;
PSI_rwlock_locker_state state;
ibool ret; ibool ret;
/* Instrumented to inform we are aquiring a shared rwlock */ /* Instrumented to inform we are aquiring a shared rwlock */

8
storage/innobase/row/row0merge.c
View File

@ -2164,8 +2164,8 @@ row_merge_file_create(
/* This temp file open does not go through normal /* This temp file open does not go through normal
file APIs, add instrumentation to register with file APIs, add instrumentation to register with
performance schema */ performance schema */
struct PSI_file_locker* locker = NULL; struct PSI_file_locker* locker = NULL;
PSI_file_locker_state state; PSI_file_locker_state state;
register_pfs_file_open_begin(&state, locker, innodb_file_temp_key, register_pfs_file_open_begin(&state, locker, innodb_file_temp_key,
PSI_FILE_OPEN, PSI_FILE_OPEN,
"Innodb Merge Temp File", "Innodb Merge Temp File",
@ -2188,8 +2188,8 @@ row_merge_file_destroy(
merge_file_t* merge_file) /*!< out: merge file structure */ merge_file_t* merge_file) /*!< out: merge file structure */
{ {
#ifdef UNIV_PFS_IO #ifdef UNIV_PFS_IO
struct PSI_file_locker* locker = NULL; struct PSI_file_locker* locker = NULL;
PSI_file_locker_state state; PSI_file_locker_state state;
register_pfs_file_io_begin(&state, locker, merge_file->fd, 0, PSI_FILE_CLOSE, register_pfs_file_io_begin(&state, locker, merge_file->fd, 0, PSI_FILE_CLOSE,
__FILE__, __LINE__); __FILE__, __LINE__);
#endif #endif