Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bpftrace
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
bpftrace
Commits
26ec5378
Commit
26ec5378
authored
Nov 22, 2018
by
Jon Haslam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix zero() problems
parent
8f7f8214
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
12 deletions
+29
-12
src/bpftrace.cpp
src/bpftrace.cpp
+29
-12
No files found.
src/bpftrace.cpp
View file @
26ec5378
...
@@ -533,8 +533,10 @@ int BPFtrace::print_map_ident(const std::string &ident, uint32_t top, uint32_t d
...
@@ -533,8 +533,10 @@ int BPFtrace::print_map_ident(const std::string &ident, uint32_t top, uint32_t d
{
{
IMap
&
map
=
*
mapmap
.
second
.
get
();
IMap
&
map
=
*
mapmap
.
second
.
get
();
if
(
map
.
name_
==
ident
)
{
if
(
map
.
name_
==
ident
)
{
if
(
map
.
type_
.
type
==
Type
::
hist
)
if
(
map
.
type_
.
type
==
Type
::
hist
||
map
.
type_
.
type
==
Type
::
lhist
)
err
=
print_map_hist
(
map
,
top
,
div
);
err
=
print_map_hist
(
map
,
top
,
div
);
else
if
(
map
.
type_
.
type
==
Type
::
avg
||
map
.
type_
.
type
==
Type
::
stats
)
err
=
print_map_stats
(
map
);
else
else
err
=
print_map
(
map
,
top
,
div
);
err
=
print_map
(
map
,
top
,
div
);
return
err
;
return
err
;
...
@@ -623,7 +625,8 @@ int BPFtrace::zero_map(IMap &map)
...
@@ -623,7 +625,8 @@ int BPFtrace::zero_map(IMap &map)
std
::
vector
<
uint8_t
>
old_key
;
std
::
vector
<
uint8_t
>
old_key
;
try
try
{
{
if
(
map
.
type_
.
type
==
Type
::
hist
)
if
(
map
.
type_
.
type
==
Type
::
hist
||
map
.
type_
.
type
==
Type
::
lhist
||
map
.
type_
.
type
==
Type
::
stats
||
map
.
type_
.
type
==
Type
::
avg
)
// hist maps have 8 extra bytes for the bucket number
// hist maps have 8 extra bytes for the bucket number
old_key
=
find_empty_key
(
map
,
map
.
key_
.
size
()
+
8
);
old_key
=
find_empty_key
(
map
,
map
.
key_
.
size
()
+
8
);
else
else
...
@@ -645,10 +648,16 @@ int BPFtrace::zero_map(IMap &map)
...
@@ -645,10 +648,16 @@ int BPFtrace::zero_map(IMap &map)
old_key
=
key
;
old_key
=
key
;
}
}
uint64_t
zero
=
0
;
int
value_size
=
map
.
type_
.
size
;
if
(
map
.
type_
.
type
==
Type
::
count
||
map
.
type_
.
type
==
Type
::
sum
||
map
.
type_
.
type
==
Type
::
min
||
map
.
type_
.
type
==
Type
::
max
||
map
.
type_
.
type
==
Type
::
avg
||
map
.
type_
.
type
==
Type
::
hist
||
map
.
type_
.
type
==
Type
::
lhist
||
map
.
type_
.
type
==
Type
::
stats
)
value_size
*=
ncpus_
;
std
::
vector
<
uint8_t
>
zero
(
value_size
,
0
);
for
(
auto
&
key
:
keys
)
for
(
auto
&
key
:
keys
)
{
{
int
err
=
bpf_update_elem
(
map
.
mapfd_
,
key
.
data
(),
&
zero
,
BPF_EXIST
);
int
err
=
bpf_update_elem
(
map
.
mapfd_
,
key
.
data
(),
zero
.
data
()
,
BPF_EXIST
);
if
(
err
)
if
(
err
)
{
{
...
@@ -680,8 +689,8 @@ int BPFtrace::print_map(IMap &map, uint32_t top, uint32_t div)
...
@@ -680,8 +689,8 @@ int BPFtrace::print_map(IMap &map, uint32_t top, uint32_t div)
while
(
bpf_get_next_key
(
map
.
mapfd_
,
old_key
.
data
(),
key
.
data
())
==
0
)
while
(
bpf_get_next_key
(
map
.
mapfd_
,
old_key
.
data
(),
key
.
data
())
==
0
)
{
{
int
value_size
=
map
.
type_
.
size
;
int
value_size
=
map
.
type_
.
size
;
if
(
map
.
type_
.
type
==
Type
::
count
||
if
(
map
.
type_
.
type
==
Type
::
count
||
map
.
type_
.
type
==
Type
::
sum
||
map
.
type_
.
type
==
Type
::
sum
||
map
.
type_
.
type
==
Type
::
min
||
map
.
type_
.
type
==
Type
::
max
)
map
.
type_
.
type
==
Type
::
min
||
map
.
type_
.
type
==
Type
::
max
)
value_size
*=
ncpus_
;
value_size
*=
ncpus_
;
auto
value
=
std
::
vector
<
uint8_t
>
(
value_size
);
auto
value
=
std
::
vector
<
uint8_t
>
(
value_size
);
int
err
=
bpf_lookup_elem
(
map
.
mapfd_
,
key
.
data
(),
value
.
data
());
int
err
=
bpf_lookup_elem
(
map
.
mapfd_
,
key
.
data
(),
value
.
data
());
...
@@ -865,8 +874,8 @@ int BPFtrace::print_map_hist(IMap &map, uint32_t top, uint32_t div)
...
@@ -865,8 +874,8 @@ int BPFtrace::print_map_hist(IMap &map, uint32_t top, uint32_t div)
int
BPFtrace
::
print_map_stats
(
IMap
&
map
)
int
BPFtrace
::
print_map_stats
(
IMap
&
map
)
{
{
//
A hist-map adds an extra 8 bytes onto the end of its key for storing
//
stats() and avg() maps add an extra 8 bytes onto the end of their key for
// the bucket number.
//
storing
the bucket number.
std
::
vector
<
uint8_t
>
old_key
;
std
::
vector
<
uint8_t
>
old_key
;
try
try
...
@@ -917,8 +926,12 @@ int BPFtrace::print_map_stats(IMap &map)
...
@@ -917,8 +926,12 @@ int BPFtrace::print_map_stats(IMap &map)
assert
(
map_elem
.
second
.
size
()
==
2
);
assert
(
map_elem
.
second
.
size
()
==
2
);
uint64_t
count
=
map_elem
.
second
.
at
(
0
);
uint64_t
count
=
map_elem
.
second
.
at
(
0
);
uint64_t
total
=
map_elem
.
second
.
at
(
1
);
uint64_t
total
=
map_elem
.
second
.
at
(
1
);
assert
(
count
!=
0
);
uint64_t
value
=
0
;
total_counts_by_key
.
push_back
({
map_elem
.
first
,
total
/
count
});
if
(
count
!=
0
)
value
=
total
/
count
;
total_counts_by_key
.
push_back
({
map_elem
.
first
,
value
});
}
}
std
::
sort
(
total_counts_by_key
.
begin
(),
total_counts_by_key
.
end
(),
[
&
](
auto
&
a
,
auto
&
b
)
std
::
sort
(
total_counts_by_key
.
begin
(),
total_counts_by_key
.
end
(),
[
&
](
auto
&
a
,
auto
&
b
)
{
{
...
@@ -933,11 +946,15 @@ int BPFtrace::print_map_stats(IMap &map)
...
@@ -933,11 +946,15 @@ int BPFtrace::print_map_stats(IMap &map)
uint64_t
count
=
value
.
at
(
0
);
uint64_t
count
=
value
.
at
(
0
);
uint64_t
total
=
value
.
at
(
1
);
uint64_t
total
=
value
.
at
(
1
);
uint64_t
average
=
0
;
if
(
count
!=
0
)
average
=
total
/
count
;
if
(
map
.
type_
.
type
==
Type
::
stats
)
if
(
map
.
type_
.
type
==
Type
::
stats
)
std
::
cout
<<
"count "
<<
count
<<
", average "
<<
total
/
count
<<
", total "
<<
total
<<
std
::
endl
;
std
::
cout
<<
"count "
<<
count
<<
", average "
<<
average
<<
", total "
<<
total
<<
std
::
endl
;
else
else
std
::
cout
<<
total
/
count
<<
std
::
endl
;
std
::
cout
<<
average
<<
std
::
endl
;
}
}
std
::
cout
<<
std
::
endl
;
std
::
cout
<<
std
::
endl
;
...
...
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