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
139b54ff
Commit
139b54ff
authored
Sep 27, 2024
by
Sergei Petrunia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-34899: part 2: add r_count_hw_instructions collected with perf.
parent
6fcf3154
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
119 additions
and
0 deletions
+119
-0
mysql-test/main/analyze_format_json_stats.result
mysql-test/main/analyze_format_json_stats.result
+14
-0
mysql-test/main/analyze_format_json_stats.test
mysql-test/main/analyze_format_json_stats.test
+16
-0
sql/sql_explain.cc
sql/sql_explain.cc
+78
-0
sql/sql_explain.h
sql/sql_explain.h
+11
-0
No files found.
mysql-test/main/analyze_format_json_stats.result
0 → 100644
View file @
139b54ff
create table t1 (a int, b int);
insert into t1 select seq, seq from seq_1_to_1000;
set profiling=1;
set @js='$js';
select json_detailed(json_query(@js, '$.r_profile_stats')) as JS;
JS
{
"r_user_time_ms": "number",
"r_system_time_ms": "number",
"r_context_voluntary": "number",
"r_context_involuntary": "number",
"r_count_hw_instructions": "number"
}
drop table t1;
mysql-test/main/analyze_format_json_stats.test
0 → 100644
View file @
139b54ff
# Test for r_profile stats output in ANALYZE.
--
source
include
/
have_sequence
.
inc
--
source
include
/
linux
.
inc
create
table
t1
(
a
int
,
b
int
);
insert
into
t1
select
seq
,
seq
from
seq_1_to_1000
;
set
profiling
=
1
;
let
$js
=
`analyze format=json select * from t1 where a>=b and b < a`
;
evalp
set
@
js
=
'$js'
;
--
replace_regex
/
(
"(r_[a-z_]*)"
)
:
[
0
-
9.
]
+/
\
1
:
"number"
/
select
json_detailed
(
json_query
(
@
js
,
'$.r_profile_stats'
))
as
JS
;
drop
table
t1
;
sql/sql_explain.cc
View file @
139b54ff
...
...
@@ -18,6 +18,17 @@
#pragma implementation // gcc: Class implementation
#endif
#ifdef __linux__
#include <linux/perf_event.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/syscall.h>
#include <sys/types.h>
#include <unistd.h>
#endif
#include "mariadb.h"
#include "sql_priv.h"
#include "sql_select.h"
...
...
@@ -48,11 +59,55 @@ Explain_query::Explain_query(THD *thd_arg, MEM_ROOT *root) :
operations
(
0
)
{
optimization_time_tracker
.
start_tracking
(
stmt_thd
);
perf_fd
=
0
;
if
(
thd_arg
->
profiling
.
is_enabled
())
{
if
((
start_profile
=
(
PROFILE_STATS
*
)
alloc_root
(
mem_root
,
sizeof
(
PROFILE_STATS
))))
start_profile
->
collect
();
#ifdef _LINUX_PERF_EVENT_H
memset
(
&
perf_event_attribute
,
0
,
sizeof
(
perf_event_attribute
));
perf_event_attribute
.
type
=
PERF_TYPE_HARDWARE
;
perf_event_attribute
.
size
=
sizeof
(
perf_event_attribute
);
perf_event_attribute
.
config
=
PERF_COUNT_HW_INSTRUCTIONS
;
perf_event_attribute
.
disabled
=
1
;
perf_event_attribute
.
exclude_kernel
=
1
;
perf_event_attribute
.
exclude_hv
=
1
;
/*
int perf_event_open(struct perf_event_attr *hw,
pid_t pid,
int cpu,
int grp,
int flags)
hw describes event and sampling configuration
pid target thread, 0=self, -1=cpu-wide mode
cpu CPU to monitor (can be used in per-thread mode)
flags provision to extend the number of parameters
grp file descriptor of group leader even
*/
perf_fd
=
syscall
(
__NR_perf_event_open
,
&
perf_event_attribute
,
0
,
-
1
,
-
1
,
0
);
if
(
perf_fd
>
0
)
{
// SIGIO must go to thread where the event occurred
struct
f_owner_ex
fown
;
fown
.
type
=
F_OWNER_TID
;
fown
.
pid
=
thd_arg
->
os_thread_id
;
fcntl
(
perf_fd
,
F_SETOWN_EX
,
&
fown
);
ioctl
(
perf_fd
,
PERF_EVENT_IOC_RESET
,
0
);
ioctl
(
perf_fd
,
PERF_EVENT_IOC_ENABLE
,
0
);
}
else
{
sql_perror
(
"syscall perf_event_open failed"
);
//TODO: can't fail an assertion: DBUG_ASSERT(0);
push_warning
(
thd_arg
,
Sql_condition
::
WARN_LEVEL_NOTE
,
ER_CANT_OPEN_FILE
,
"syscall perf_event_open failed"
);
}
#endif
}
}
...
...
@@ -81,6 +136,13 @@ Explain_query::~Explain_query()
delete
unions
.
at
(
i
);
for
(
i
=
0
;
i
<
selects
.
elements
();
i
++
)
delete
selects
.
at
(
i
);
#ifdef _LINUX_PERF_EVENT_H
// TODO: in case of query error, we will never make a call with
// PERF_EVENT_IOC_DISABLE. Is this ok?
if
(
perf_fd
>
0
)
close
(
perf_fd
);
#endif
}
...
...
@@ -290,6 +352,22 @@ int Explain_query::print_explain_json(select_result_sink *output,
writer
.
add_member
(
"r_profile_stats"
);
Json_writer_object
obj
(
&
writer
);
endp
.
write_increment_json
(
&
obj
,
start_profile
);
#ifdef _LINUX_PERF_EVENT_H
if
(
perf_fd
>
0
)
{
//TODO: make this work for SHOW ANALYZE.
// In SHOW ANALYZE FORMAT=JSON, this may be called multiple times.
// We should take measurement from query start to the current point
// and then continue counting.
long
long
count_hw_instructions
;
ioctl
(
perf_fd
,
PERF_EVENT_IOC_DISABLE
,
0
);
ssize_t
size
=
sizeof
(
count_hw_instructions
);
if
(
size
==
read
(
perf_fd
,
&
count_hw_instructions
,
size
))
obj
.
add
(
"r_count_hw_instructions"
,
count_hw_instructions
);
}
#endif
}
bool
plan_found
=
print_query_blocks_json
(
&
writer
,
is_analyze
);
...
...
sql/sql_explain.h
View file @
139b54ff
...
...
@@ -55,6 +55,12 @@ it into the slow query log.
#include "sql_profile.h"
/* for PROFILE_STATS */
#ifdef __linux__
#include <unistd.h>
# include <linux/perf_event.h>
# include <linux/hw_breakpoint.h>
#endif
class
String_list
:
public
List
<
char
>
{
public:
...
...
@@ -543,6 +549,11 @@ class Explain_query : public Sql_alloc
the counters taken at the query start.
*/
PROFILE_STATS
*
start_profile
=
nullptr
;
#ifdef _LINUX_PERF_EVENT_H
struct
perf_event_attr
perf_event_attribute
;
int
perf_fd
;
#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