Skip to content

M
MariaDB
Commit 06442e3e authored by Eugene Kosov's avatar Eugene Kosov Committed by Marko Mäkelä
Browse files
Options

MDEV-19399 do not call slow my_timer_init() several times 

No functional change.

Call my_timer_init() only once and then reuse it from InnoDB and
perfschema storage engines.

This patch speeds up empty test for me like this:
./mtr -mem innodb.kevg,xtradb  1.21s user 0.84s system 34% cpu 5.999 total
./mtr -mem innodb.kevg,xtradb  1.12s user 0.60s system 31% cpu 5.385 total
parent d0ee3b55
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 56 deletions
sql/mysqld.h
View file @ 06442e3e
...@@ -64,7 +64,7 @@ typedef Bitmap<((MAX_INDEXES+7)/8*8)> key_map; /* Used for finding keys */ ...@@ -64,7 +64,7 @@ typedef Bitmap<((MAX_INDEXES+7)/8*8)> key_map; /* Used for finding keys */
#define OPT_SESSION SHOW_OPT_SESSION #define OPT_SESSION SHOW_OPT_SESSION
#define OPT_GLOBAL SHOW_OPT_GLOBAL #define OPT_GLOBAL SHOW_OPT_GLOBAL
extern MY_TIMER_INFO sys_timer_info; extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info;
/* /*
Values for --slave-parallel-mode Values for --slave-parallel-mode
......
storage/innobase/ut/ut0timer.cc
View file @ 06442e3e
...@@ -46,6 +46,7 @@ Function pointer to point selected timer function. ...@@ -46,6 +46,7 @@ Function pointer to point selected timer function.
ulonglong (*ut_timer_now)(void) = &ut_timer_none; ulonglong (*ut_timer_now)(void) = &ut_timer_none;
struct my_timer_unit_info ut_timer; struct my_timer_unit_info ut_timer;
extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info;
/**************************************************************//** /**************************************************************//**
Sets up the data required for use of my_timer_* functions. Sets up the data required for use of my_timer_* functions.
...@@ -57,30 +58,27 @@ void ...@@ -57,30 +58,27 @@ void
ut_init_timer(void) ut_init_timer(void)
/*===============*/ /*===============*/
{ {
MY_TIMER_INFO all_timer_info; if (sys_timer_info.cycles.frequency > 1000000 &&
my_timer_init(&all_timer_info); sys_timer_info.cycles.resolution == 1) {
ut_timer = sys_timer_info.cycles;
if (all_timer_info.cycles.frequency > 1000000 &&
all_timer_info.cycles.resolution == 1) {
ut_timer = all_timer_info.cycles;
ut_timer_now = &my_timer_cycles; ut_timer_now = &my_timer_cycles;
} else if (all_timer_info.nanoseconds.frequency > 1000000 && } else if (sys_timer_info.nanoseconds.frequency > 1000000 &&
all_timer_info.nanoseconds.resolution == 1) { sys_timer_info.nanoseconds.resolution == 1) {
ut_timer = all_timer_info.nanoseconds; ut_timer = sys_timer_info.nanoseconds;
ut_timer_now = &my_timer_nanoseconds; ut_timer_now = &my_timer_nanoseconds;
} else if (all_timer_info.microseconds.frequency >= 1000000 && } else if (sys_timer_info.microseconds.frequency >= 1000000 &&
all_timer_info.microseconds.resolution == 1) { sys_timer_info.microseconds.resolution == 1) {
ut_timer = all_timer_info.microseconds; ut_timer = sys_timer_info.microseconds;
ut_timer_now = &my_timer_microseconds; ut_timer_now = &my_timer_microseconds;
} else if (all_timer_info.milliseconds.frequency >= 1000 && } else if (sys_timer_info.milliseconds.frequency >= 1000 &&
all_timer_info.milliseconds.resolution == 1) { sys_timer_info.milliseconds.resolution == 1) {
ut_timer = all_timer_info.milliseconds; ut_timer = sys_timer_info.milliseconds;
ut_timer_now = &my_timer_milliseconds; ut_timer_now = &my_timer_milliseconds;
} else if (all_timer_info.ticks.frequency >= 1000 && } else if (sys_timer_info.ticks.frequency >= 1000 &&
/* Will probably be false */ /* Will probably be false */
all_timer_info.ticks.resolution == 1) { sys_timer_info.ticks.resolution == 1) {
ut_timer = all_timer_info.ticks; ut_timer = sys_timer_info.ticks;
ut_timer_now = &my_timer_ticks; ut_timer_now = &my_timer_ticks;
} else { } else {
/* None are acceptable, so leave it as "None", and fill in struct */ /* None are acceptable, so leave it as "None", and fill in struct */
......
storage/perfschema/pfs_timer.cc
View file @ 06442e3e
...@@ -26,7 +26,6 @@ enum_timer_name idle_timer= TIMER_NAME_MICROSEC; ...@@ -26,7 +26,6 @@ enum_timer_name idle_timer= TIMER_NAME_MICROSEC;
enum_timer_name wait_timer= TIMER_NAME_CYCLE; enum_timer_name wait_timer= TIMER_NAME_CYCLE;
enum_timer_name stage_timer= TIMER_NAME_NANOSEC; enum_timer_name stage_timer= TIMER_NAME_NANOSEC;
enum_timer_name statement_timer= TIMER_NAME_NANOSEC; enum_timer_name statement_timer= TIMER_NAME_NANOSEC;
MY_TIMER_INFO pfs_timer_info;
static ulonglong cycle_v0; static ulonglong cycle_v0;
static ulonglong nanosec_v0; static ulonglong nanosec_v0;
...@@ -65,41 +64,39 @@ void init_timers(void) ...@@ -65,41 +64,39 @@ void init_timers(void)
{ {
double pico_frequency= 1.0e12; double pico_frequency= 1.0e12;
my_timer_init(&pfs_timer_info);
cycle_v0= my_timer_cycles(); cycle_v0= my_timer_cycles();
nanosec_v0= my_timer_nanoseconds(); nanosec_v0= my_timer_nanoseconds();
microsec_v0= my_timer_microseconds(); microsec_v0= my_timer_microseconds();
millisec_v0= my_timer_milliseconds(); millisec_v0= my_timer_milliseconds();
tick_v0= my_timer_ticks(); tick_v0= my_timer_ticks();
if (pfs_timer_info.cycles.frequency > 0) if (sys_timer_info.cycles.frequency > 0)
cycle_to_pico= round_to_ulong(pico_frequency/ cycle_to_pico= round_to_ulong(pico_frequency/
(double)pfs_timer_info.cycles.frequency); (double)sys_timer_info.cycles.frequency);
else else
cycle_to_pico= 0; cycle_to_pico= 0;
if (pfs_timer_info.nanoseconds.frequency > 0) if (sys_timer_info.nanoseconds.frequency > 0)
nanosec_to_pico= round_to_ulong(pico_frequency/ nanosec_to_pico= round_to_ulong(pico_frequency/
(double)pfs_timer_info.nanoseconds.frequency); (double)sys_timer_info.nanoseconds.frequency);
else else
nanosec_to_pico= 0; nanosec_to_pico= 0;
if (pfs_timer_info.microseconds.frequency > 0) if (sys_timer_info.microseconds.frequency > 0)
microsec_to_pico= round_to_ulong(pico_frequency/ microsec_to_pico= round_to_ulong(pico_frequency/
(double)pfs_timer_info.microseconds.frequency); (double)sys_timer_info.microseconds.frequency);
else else
microsec_to_pico= 0; microsec_to_pico= 0;
if (pfs_timer_info.milliseconds.frequency > 0) if (sys_timer_info.milliseconds.frequency > 0)
millisec_to_pico= round_to_ulong(pico_frequency/ millisec_to_pico= round_to_ulong(pico_frequency/
(double)pfs_timer_info.milliseconds.frequency); (double)sys_timer_info.milliseconds.frequency);
else else
millisec_to_pico= 0; millisec_to_pico= 0;
if (pfs_timer_info.ticks.frequency > 0) if (sys_timer_info.ticks.frequency > 0)
tick_to_pico= round_to_ulonglong(pico_frequency/ tick_to_pico= round_to_ulonglong(pico_frequency/
(double)pfs_timer_info.ticks.frequency); (double)sys_timer_info.ticks.frequency);
else else
tick_to_pico= 0; tick_to_pico= 0;
......
storage/perfschema/pfs_timer.h
View file @ 06442e3e
...@@ -102,7 +102,7 @@ extern enum_timer_name statement_timer; ...@@ -102,7 +102,7 @@ extern enum_timer_name statement_timer;
Timer information data. Timer information data.
Characteristics about each suported timer. Characteristics about each suported timer.
*/ */
extern MY_TIMER_INFO pfs_timer_info; extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info;
/** Initialize the timer component. */ /** Initialize the timer component. */
void init_timers(); void init_timers();
......
storage/perfschema/table_performance_timers.cc
View file @ 06442e3e
...@@ -58,23 +58,23 @@ table_performance_timers::table_performance_timers() ...@@ -58,23 +58,23 @@ table_performance_timers::table_performance_timers()
index= (int)TIMER_NAME_CYCLE - FIRST_TIMER_NAME; index= (int)TIMER_NAME_CYCLE - FIRST_TIMER_NAME;
m_data[index].m_timer_name= TIMER_NAME_CYCLE; m_data[index].m_timer_name= TIMER_NAME_CYCLE;
m_data[index].m_info= pfs_timer_info.cycles; m_data[index].m_info= sys_timer_info.cycles;
index= (int)TIMER_NAME_NANOSEC - FIRST_TIMER_NAME; index= (int)TIMER_NAME_NANOSEC - FIRST_TIMER_NAME;
m_data[index].m_timer_name= TIMER_NAME_NANOSEC; m_data[index].m_timer_name= TIMER_NAME_NANOSEC;
m_data[index].m_info= pfs_timer_info.nanoseconds; m_data[index].m_info= sys_timer_info.nanoseconds;
index= (int)TIMER_NAME_MICROSEC - FIRST_TIMER_NAME; index= (int)TIMER_NAME_MICROSEC - FIRST_TIMER_NAME;
m_data[index].m_timer_name= TIMER_NAME_MICROSEC; m_data[index].m_timer_name= TIMER_NAME_MICROSEC;
m_data[index].m_info= pfs_timer_info.microseconds; m_data[index].m_info= sys_timer_info.microseconds;
index= (int)TIMER_NAME_MILLISEC - FIRST_TIMER_NAME; index= (int)TIMER_NAME_MILLISEC - FIRST_TIMER_NAME;
m_data[index].m_timer_name= TIMER_NAME_MILLISEC; m_data[index].m_timer_name= TIMER_NAME_MILLISEC;
m_data[index].m_info= pfs_timer_info.milliseconds; m_data[index].m_info= sys_timer_info.milliseconds;
index= (int)TIMER_NAME_TICK - FIRST_TIMER_NAME; index= (int)TIMER_NAME_TICK - FIRST_TIMER_NAME;
m_data[index].m_timer_name= TIMER_NAME_TICK; m_data[index].m_timer_name= TIMER_NAME_TICK;
m_data[index].m_info= pfs_timer_info.ticks; m_data[index].m_info= sys_timer_info.ticks;
} }
void table_performance_timers::reset_position(void) void table_performance_timers::reset_position(void)
......
storage/perfschema/unittest/pfs_server_stubs.cc
View file @ 06442e3e
...@@ -43,3 +43,5 @@ enum sys_var::where get_sys_var_value_origin(void *ptr) ...@@ -43,3 +43,5 @@ enum sys_var::where get_sys_var_value_origin(void *ptr)
{ {
return sys_var::AUTO; return sys_var::AUTO;
} }
MY_TIMER_INFO sys_timer_info;
storage/perfschema/unittest/pfs_timer-t.cc
View file @ 06442e3e
...@@ -33,6 +33,8 @@ void test_timers() ...@@ -33,6 +33,8 @@ void test_timers()
ulonglong t4_b; ulonglong t4_b;
ulonglong t5_b; ulonglong t5_b;
my_timer_init(&sys_timer_info);
init_timers(); init_timers();
t1_a= get_timer_pico_value(TIMER_NAME_CYCLE); t1_a= get_timer_pico_value(TIMER_NAME_CYCLE);
......
storage/xtradb/ut/ut0timer.cc
View file @ 06442e3e
...@@ -47,6 +47,8 @@ ulonglong (*ut_timer_now)(void) = &ut_timer_none; ...@@ -47,6 +47,8 @@ ulonglong (*ut_timer_now)(void) = &ut_timer_none;
struct my_timer_unit_info ut_timer; struct my_timer_unit_info ut_timer;
extern MYSQL_PLUGIN_IMPORT MY_TIMER_INFO sys_timer_info;
/**************************************************************//** /**************************************************************//**
Sets up the data required for use of my_timer_* functions. Sets up the data required for use of my_timer_* functions.
Selects the best timer by high frequency, and tight resolution. Selects the best timer by high frequency, and tight resolution.
...@@ -57,30 +59,27 @@ void ...@@ -57,30 +59,27 @@ void
ut_init_timer(void) ut_init_timer(void)
/*===============*/ /*===============*/
{ {
MY_TIMER_INFO all_timer_info; if (sys_timer_info.cycles.frequency > 1000000 &&
my_timer_init(&all_timer_info); sys_timer_info.cycles.resolution == 1) {
ut_timer = sys_timer_info.cycles;
if (all_timer_info.cycles.frequency > 1000000 &&
all_timer_info.cycles.resolution == 1) {
ut_timer = all_timer_info.cycles;
ut_timer_now = &my_timer_cycles; ut_timer_now = &my_timer_cycles;
} else if (all_timer_info.nanoseconds.frequency > 1000000 && } else if (sys_timer_info.nanoseconds.frequency > 1000000 &&
all_timer_info.nanoseconds.resolution == 1) { sys_timer_info.nanoseconds.resolution == 1) {
ut_timer = all_timer_info.nanoseconds; ut_timer = sys_timer_info.nanoseconds;
ut_timer_now = &my_timer_nanoseconds; ut_timer_now = &my_timer_nanoseconds;
} else if (all_timer_info.microseconds.frequency >= 1000000 && } else if (sys_timer_info.microseconds.frequency >= 1000000 &&
all_timer_info.microseconds.resolution == 1) { sys_timer_info.microseconds.resolution == 1) {
ut_timer = all_timer_info.microseconds; ut_timer = sys_timer_info.microseconds;
ut_timer_now = &my_timer_microseconds; ut_timer_now = &my_timer_microseconds;
} else if (all_timer_info.milliseconds.frequency >= 1000 && } else if (sys_timer_info.milliseconds.frequency >= 1000 &&
all_timer_info.milliseconds.resolution == 1) { sys_timer_info.milliseconds.resolution == 1) {
ut_timer = all_timer_info.milliseconds; ut_timer = sys_timer_info.milliseconds;
ut_timer_now = &my_timer_milliseconds; ut_timer_now = &my_timer_milliseconds;
} else if (all_timer_info.ticks.frequency >= 1000 && } else if (sys_timer_info.ticks.frequency >= 1000 &&
/* Will probably be false */ /* Will probably be false */
all_timer_info.ticks.resolution == 1) { sys_timer_info.ticks.resolution == 1) {
ut_timer = all_timer_info.ticks; ut_timer = sys_timer_info.ticks;
ut_timer_now = &my_timer_ticks; ut_timer_now = &my_timer_ticks;
} else { } else {
/* None are acceptable, so leave it as "None", and fill in struct */ /* None are acceptable, so leave it as "None", and fill in struct */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7