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

Replace some functions with macros.

Browse Source 
This is a non-functional change.

On a related note, the calls fil_system_enter() and fil_system_exit()
are often used in an unsafe manner. The fix of MDEV-11738 should
introduce fil_space_acquire() and remove potential race conditions.
This commit is contained in:
Marko Mäkelä 2017-03-06 10:02:01 +02:00
parent adc91387e3
commit 68d632bc5a
4 changed files with 8 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
storage/innobase/fil/fil0fil.cc
View File

@ -7146,27 +7146,6 @@ fil_mtr_rename_log(
return(err); return(err);
} }
/****************************************************************//**
Acquire fil_system mutex */
void
fil_system_enter(void)
/*==================*/
{
ut_ad(!mutex_own(&fil_system->mutex));
mutex_enter(&fil_system->mutex);
}
/****************************************************************//**
Release fil_system mutex */
void
fil_system_exit(void)
/*=================*/
{
ut_ad(mutex_own(&fil_system->mutex));
mutex_exit(&fil_system->mutex);
}
/****************************************************************** /******************************************************************
Get id of first tablespace or ULINT_UNDEFINED if none */ Get id of first tablespace or ULINT_UNDEFINED if none */
UNIV_INTERN UNIV_INTERN

14
storage/innobase/include/fil0fil.h
View File

@ -1290,16 +1290,10 @@ fil_space_get(
ulint id); /*!< in: space id */ ulint id); /*!< in: space id */
#endif /* !UNIV_INNOCHECKSUM */ #endif /* !UNIV_INNOCHECKSUM */
/****************************************************************//** /** Acquire the fil_system mutex. */
Acquire fil_system mutex */ #define fil_system_enter() mutex_enter(&fil_system->mutex)
void /** Release the fil_system mutex. */
fil_system_enter(void); #define fil_system_exit() mutex_exit(&fil_system->mutex)
/*==================*/
/****************************************************************//**
Release fil_system mutex */
void
fil_system_exit(void);
/*==================*/
#ifndef UNIV_INNOCHECKSUM #ifndef UNIV_INNOCHECKSUM
/*******************************************************************//** /*******************************************************************//**

21
storage/xtradb/fil/fil0fil.cc
View File

@ -7260,27 +7260,6 @@ fil_space_set_corrupt(
mutex_exit(&fil_system->mutex); mutex_exit(&fil_system->mutex);
} }
/****************************************************************//**
Acquire fil_system mutex */
void
fil_system_enter(void)
/*==================*/
{
ut_ad(!mutex_own(&fil_system->mutex));
mutex_enter(&fil_system->mutex);
}
/****************************************************************//**
Release fil_system mutex */
void
fil_system_exit(void)
/*=================*/
{
ut_ad(mutex_own(&fil_system->mutex));
mutex_exit(&fil_system->mutex);
}
/****************************************************************** /******************************************************************
Get id of first tablespace or ULINT_UNDEFINED if none */ Get id of first tablespace or ULINT_UNDEFINED if none */
UNIV_INTERN UNIV_INTERN

14
storage/xtradb/include/fil0fil.h
View File

@ -1314,16 +1314,10 @@ fil_space_set_corrupt(
/*==================*/ /*==================*/
ulint space_id); ulint space_id);
/****************************************************************//** /** Acquire the fil_system mutex. */
Acquire fil_system mutex */ #define fil_system_enter() mutex_enter(&fil_system->mutex)
void /** Release the fil_system mutex. */
fil_system_enter(void); #define fil_system_exit() mutex_exit(&fil_system->mutex)
/*==================*/
/****************************************************************//**
Release fil_system mutex */
void
fil_system_exit(void);
/*==================*/
#ifndef UNIV_INNOCHECKSUM #ifndef UNIV_INNOCHECKSUM
/*******************************************************************//** /*******************************************************************//**