Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow for sharing of python tools/ scripts #1531

Merged
merged 4 commits into from
Jan 22, 2018
Merged

Allow for sharing of python tools/ scripts #1531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d10c642
correct error reporting on python text compilation
natoscott Jan 15, 2018
ca4ba55
start adding -e/--ebpf option to the python tools/ scripts
natoscott Jan 16, 2018
f5fb9af
Drop -e option to python scripts, use hidden --ebpf only.
natoscott Jan 16, 2018
1a197db
Drop use of 'allow_abbrev' as its python 3.5 or later only
natoscott Jan 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/python/bcc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ def __init__(self, src_file="", hdr_file="", text=None, cb=None, debug=0,
if text:
self.module = lib.bpf_module_create_c_from_string(text.encode("ascii"),
self.debug, cflags_array, len(cflags_array))
if not self.module:
raise Exception("Failed to compile BPF text:\n%s" % text)
else:
src_file = BPF._find_file(src_file)
hdr_file = BPF._find_file(hdr_file)
Expand All @@ -296,9 +298,8 @@ def __init__(self, src_file="", hdr_file="", text=None, cb=None, debug=0,
else:
self.module = lib.bpf_module_create_c(src_file.encode("ascii"),
self.debug, cflags_array, len(cflags_array))

if not self.module:
raise Exception("Failed to compile BPF module %s" % src_file)
if not self.module:
raise Exception("Failed to compile BPF module %s" % src_file)

for usdt_context in usdt_contexts:
usdt_context.attach_uprobes(self)
Expand Down
6 changes: 5 additions & 1 deletion tools/biolatency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
help="output interval, in seconds")
parser.add_argument("count", nargs="?", default=99999999,
help="number of outputs")
parser.add_argument("--ebpf", action="store_true",
help=argparse.SUPPRESS)
args = parser.parse_args()
countdown = int(args.count)
debug = 0
Expand Down Expand Up @@ -103,8 +105,10 @@
bpf_text = bpf_text.replace('STORAGE', 'BPF_HISTOGRAM(dist);')
bpf_text = bpf_text.replace('STORE',
'dist.increment(bpf_log2l(delta));')
if debug:
if debug or args.ebpf:
print(bpf_text)
if args.ebpf:
exit()

# load BPF program
b = BPF(text=bpf_text)
Expand Down
12 changes: 10 additions & 2 deletions tools/biotop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
help="output interval, in seconds")
parser.add_argument("count", nargs="?", default=99999999,
help="number of outputs")
parser.add_argument("--ebpf", action="store_true",
help=argparse.SUPPRESS)
args = parser.parse_args()
interval = int(args.interval)
countdown = int(args.count)
Expand All @@ -55,7 +57,7 @@ def signal_ignore(signal, frame):
print()

# load BPF program
b = BPF(text="""
bpf_text = """
#include <uapi/linux/ptrace.h>
#include <linux/blkdev.h>

Expand Down Expand Up @@ -163,7 +165,13 @@ def signal_ignore(signal, frame):

return 0;
}
""", debug=0)
"""

if args.ebpf:
print(bpf_text)
exit()

b = BPF(text=bpf_text)
b.attach_kprobe(event="blk_account_io_start", fn_name="trace_pid_start")
b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
Expand Down
6 changes: 5 additions & 1 deletion tools/tcplife.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
help="comma-separated list of local ports to trace.")
parser.add_argument("-D", "--remoteport",
help="comma-separated list of remote ports to trace.")
parser.add_argument("--ebpf", action="store_true",
help=argparse.SUPPRESS)
args = parser.parse_args()
debug = 0

Expand Down Expand Up @@ -375,8 +377,10 @@
bpf_text = bpf_text.replace('FILTER_DPORT', '')
bpf_text = bpf_text.replace('FILTER_LPORT', '')

if debug:
if debug or args.ebpf:
print(bpf_text)
if args.ebpf:
exit()

# event data
TASK_COMM_LEN = 16 # linux/sched.h
Expand Down