database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Backport:

Browse Source 
B-g#27501: 5.0 significantly more sys ("kernel") time than 4.1 \
      due to getrusage() calls

Even if profiling is turned off, the parser makes calls to reset 
the state at the beginning of each query.  That would eventually 
instantiate a PROFILE_ENTRY, which does indeed capture resource 
usage.

Instead, now check that profiling is active before progressing
far into the storage/expiration of old entries in the history.
This has the pleasant side-effect that queries to toggle profiling
are not recorded in the history.
This commit is contained in:
cmiller@zippy.cornsilk.net
2007-04-03 19:50:55 -04:00
parent b7a27a6b96
commit cd28612e4b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/profiling.result
View File

@ -248,6 +248,7 @@ sum(id)
12 12
show profiles; show profiles;
Query_ID Duration Query Query_ID Duration Query
15 # select count(*) from t1
16 # insert into t1 select * from t1 16 # insert into t1 select * from t1
17 # insert into t1 select * from t1 17 # insert into t1 select * from t1
18 # insert into t1 select * from t1 18 # insert into t1 select * from t1
@ -277,7 +278,6 @@ Query_ID Duration Query
42 # insert into t1 values (1), (2), (3) 42 # insert into t1 values (1), (2), (3)
43 # insert into t1 values (1), (2), (3) 43 # insert into t1 values (1), (2), (3)
44 # select * from t1 44 # select * from t1
45 # set session profiling = OFF
set session profiling = ON; set session profiling = ON;
select @@profiling; select @@profiling;
@@profiling @@profiling

11
sql/sql_profile.cc
View File

@ -493,6 +493,9 @@ void PROFILING::store()
while (history.elements > thd->variables.profiling_history_size) while (history.elements > thd->variables.profiling_history_size)
delete history.pop(); delete history.pop();
if (likely(((thd)->options & OPTION_PROFILING) == 0))
DBUG_VOID_RETURN;
if (current != NULL) if (current != NULL)
{ {
if (keeping && if (keeping &&
@ -519,12 +522,20 @@ void PROFILING::store()
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
/**
Store and clean up the old information and get ready to hold info about this
new query. This is called very often so it must be very lightweight if
profiling is not active.
*/
void PROFILING::reset() void PROFILING::reset()
{ {
DBUG_ENTER("PROFILING::reset"); DBUG_ENTER("PROFILING::reset");
store(); store();
if (likely(((thd)->options & OPTION_PROFILING) == 0))
DBUG_VOID_RETURN;
if (current != NULL) if (current != NULL)
current->reset(); current->reset();
keep(); keep();