Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bcc
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
bcc
Commits
bdbc4726
Commit
bdbc4726
authored
Mar 03, 2017
by
4ast
Committed by
GitHub
Mar 03, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1021 from markdrayton/sym-mod-fix
python: handle null module in BPF.sym
parents
c924193f
dcf8cf98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/python/bcc/__init__.py
src/python/bcc/__init__.py
+4
-3
No files found.
src/python/bcc/__init__.py
View file @
bdbc4726
...
@@ -995,12 +995,12 @@ class BPF(object):
...
@@ -995,12 +995,12 @@ class BPF(object):
returned. When show_module is True, the module name is also included.
returned. When show_module is True, the module name is also included.
When show_offset is True, the instruction offset as a hexadecimal
When show_offset is True, the instruction offset as a hexadecimal
number is also included in the string.
number is also included in the string.
A pid of less than zero will access the kernel symbol cache.
A pid of less than zero will access the kernel symbol cache.
Example output when both show_module and show_offset are True:
Example output when both show_module and show_offset are True:
"start_thread+0x202 [libpthread-2.24.so]"
"start_thread+0x202 [libpthread-2.24.so]"
Example output when both show_module and show_offset are False:
Example output when both show_module and show_offset are False:
"start_thread"
"start_thread"
"""
"""
...
@@ -1008,7 +1008,8 @@ class BPF(object):
...
@@ -1008,7 +1008,8 @@ class BPF(object):
offset
=
"+0x%x"
%
offset
if
show_offset
and
name
is
not
None
else
""
offset
=
"+0x%x"
%
offset
if
show_offset
and
name
is
not
None
else
""
name
=
name
or
"[unknown]"
name
=
name
or
"[unknown]"
name
=
name
+
offset
name
=
name
+
offset
module
=
" [%s]"
%
os
.
path
.
basename
(
module
)
if
show_module
else
""
module
=
" [%s]"
%
os
.
path
.
basename
(
module
)
\
if
show_module
and
module
is
not
None
else
""
return
name
+
module
return
name
+
module
@
staticmethod
@
staticmethod
...
...
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