From dbf002924589e90d9e51cbc610fec0eb5fba374a Mon Sep 17 00:00:00 2001 From: Teng Qin Date: Wed, 28 Feb 2018 21:47:50 -0800 Subject: [PATCH] Rename kprobe_poll to perf_buffer_poll --- docs/reference_guide.md | 18 +++++++++--------- docs/tutorial_bcc_python_developer.md | 4 ++-- examples/lua/bashreadline.lua | 2 +- examples/networking/tc_perf_event.py | 2 +- examples/tracing/hello_perf_output.py | 2 +- examples/tracing/stacksnoop.py | 2 +- examples/tracing/trace_perf_output.py | 2 +- examples/usdt_sample/scripts/latency.py | 2 +- src/lua/bcc/bpf.lua | 12 ++++++++++-- src/python/bcc/__init__.py | 15 +++++++++++---- tests/python/test_array.py | 4 ++-- tests/python/test_usdt.py | 2 +- tests/python/test_usdt2.py | 2 +- tests/python/test_usdt3.py | 2 +- tools/bashreadline.py | 2 +- tools/biosnoop.lua | 2 +- tools/biosnoop.py | 2 +- tools/btrfsslower.py | 2 +- tools/capable.py | 2 +- tools/cpuunclaimed.py | 2 +- tools/dbslower.py | 2 +- tools/dcsnoop.py | 2 +- tools/execsnoop.py | 2 +- tools/ext4slower.py | 2 +- tools/filelife.py | 2 +- tools/fileslower.py | 2 +- tools/funcslower.py | 2 +- tools/gethostlatency.py | 2 +- tools/killsnoop.py | 2 +- tools/lib/uflow.py | 2 +- tools/lib/ugc.py | 2 +- tools/lib/uthreads.py | 2 +- tools/mdflush.py | 2 +- tools/mountsnoop.py | 2 +- tools/mysqld_qslower.py | 2 +- tools/nfsslower.py | 2 +- tools/oomkill.py | 2 +- tools/opensnoop.py | 2 +- tools/solisten.py | 2 +- tools/sslsniff.py | 2 +- tools/stacksnoop.lua | 2 +- tools/statsnoop.py | 2 +- tools/syncsnoop.py | 2 +- tools/tcpaccept.py | 2 +- tools/tcpconnect.py | 2 +- tools/tcpconnlat.py | 2 +- tools/tcplife.lua | 2 +- tools/tcplife.py | 2 +- tools/tcpretrans.py | 2 +- tools/tcptracer.py | 2 +- tools/trace.py | 2 +- tools/ttysnoop.py | 2 +- tools/xfsslower.py | 2 +- tools/zfsslower.py | 2 +- 54 files changed, 83 insertions(+), 68 deletions(-) diff --git a/docs/reference_guide.md b/docs/reference_guide.md index f57b54bb6ddc..441d6864825a 100644 --- a/docs/reference_guide.md +++ b/docs/reference_guide.md @@ -64,7 +64,7 @@ This guide is incomplete. If something feels missing, check the bcc and kernel s - [1. trace_print()](#1-trace_print) - [2. trace_fields()](#2-trace_fields) - [Output](#output) - - [1. kprobe_poll()](#1-kprobe_poll) + - [1. perf_buffer_poll()](#1-perf_buffer_poll) - [Maps](#maps) - [1. get_table()](#1-get_table) - [2. open_perf_buffer()](#2-open_perf_buffer) @@ -1023,14 +1023,14 @@ Examples in situ: Normal output from a BPF program is either: -- per-event: using PERF_EVENT_OUTPUT, open_perf_buffer(), and kprobe_poll(). +- per-event: using PERF_EVENT_OUTPUT, open_perf_buffer(), and perf_buffer_poll(). - map summary: using items(), or print_log2_hist(), covered in the Maps section. -### 1. kprobe_poll() +### 1. perf_buffer_poll() -Syntax: ```BPF.kprobe_poll()``` +Syntax: ```BPF.perf_buffer_poll()``` -This polls from the ring buffers for all of the open kprobes, calling the callback function that was given in the BPF constructor for each entry, usually via ```open_perf_buffer()```. +This polls from all open perf ring buffers, calling the callback function that was provided when calling open_perf_buffer for each entry. Example: @@ -1038,13 +1038,13 @@ Example: # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() ``` Examples in situ: [code](https://github.com/iovisor/bcc/blob/08fbceb7e828f0e3e77688497727c5b2405905fd/examples/tracing/hello_perf_output.py#L61), -[search /examples](https://github.com/iovisor/bcc/search?q=kprobe_poll+path%3Aexamples+language%3Apython&type=Code), -[search /tools](https://github.com/iovisor/bcc/search?q=kprobe_poll+path%3Atools+language%3Apython&type=Code) +[search /examples](https://github.com/iovisor/bcc/search?q=perf_buffer_poll+path%3Aexamples+language%3Apython&type=Code), +[search /tools](https://github.com/iovisor/bcc/search?q=perf_buffer_poll+path%3Atools+language%3Apython&type=Code) ## Maps @@ -1083,7 +1083,7 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() ``` Note that the data structure transferred will need to be declared in C in the BPF program, and in Python. For example: diff --git a/docs/tutorial_bcc_python_developer.md b/docs/tutorial_bcc_python_developer.md index 1284156fcdb4..8fa8ebb5c2ce 100644 --- a/docs/tutorial_bcc_python_developer.md +++ b/docs/tutorial_bcc_python_developer.md @@ -305,7 +305,7 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() ``` Things to learn: @@ -319,7 +319,7 @@ Things to learn: 1. ```class Data(ct.Structure)```: Now define the Python version of the C data structure. 1. ```def print_event()```: Define a Python function that will handle reading events from the ```events``` stream. 1. ```b["events"].open_perf_buffer(print_event)```: Associate the Python ```print_event``` function with the ```events``` stream. -1. ```while 1: b.kprobe_poll()```: Block waiting for events. +1. ```while 1: b.perf_buffer_poll()```: Block waiting for events. This may be improved in future bcc versions. Eg, the Python data struct could be auto-generated from the C code. diff --git a/examples/lua/bashreadline.lua b/examples/lua/bashreadline.lua index 045fbc0148f5..f7bb9ff045f6 100755 --- a/examples/lua/bashreadline.lua +++ b/examples/lua/bashreadline.lua @@ -27,5 +27,5 @@ return function(BPF) b:get_table("events"):open_perf_buffer(print_readline, "struct { uint64_t pid; char str[80]; }", nil) print("%-9s %-6s %s" % {"TIME", "PID", "COMMAND"}) - b:kprobe_poll_loop() + b:perf_buffer_poll_loop() end diff --git a/examples/networking/tc_perf_event.py b/examples/networking/tc_perf_event.py index f181a4b13334..0b9b3f5dbf59 100755 --- a/examples/networking/tc_perf_event.py +++ b/examples/networking/tc_perf_event.py @@ -80,6 +80,6 @@ class SkbEvent(ct.Structure): print('Try: "ping -6 ff02::1%me"\n') print("%-3s %-32s %-12s %-10s" % ("CPU", "SRC IP", "DST IP", "Magic")) while True: - b.kprobe_poll() + b.perf_buffer_poll() finally: if "me" in locals(): ipr.link("del", index=me) diff --git a/examples/tracing/hello_perf_output.py b/examples/tracing/hello_perf_output.py index cfff2643ea2f..f88028014594 100755 --- a/examples/tracing/hello_perf_output.py +++ b/examples/tracing/hello_perf_output.py @@ -58,4 +58,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/examples/tracing/stacksnoop.py b/examples/tracing/stacksnoop.py index 7b3d0186ffcd..bced93f13407 100755 --- a/examples/tracing/stacksnoop.py +++ b/examples/tracing/stacksnoop.py @@ -120,4 +120,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/examples/tracing/trace_perf_output.py b/examples/tracing/trace_perf_output.py index 62cb7a836bb0..5ce87d946304 100755 --- a/examples/tracing/trace_perf_output.py +++ b/examples/tracing/trace_perf_output.py @@ -51,4 +51,4 @@ def print_counter(): print("Tracing sys_write, try `dd if=/dev/zero of=/dev/null`") print("Tracing... Hit Ctrl-C to end.") while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/examples/usdt_sample/scripts/latency.py b/examples/usdt_sample/scripts/latency.py index 7b033eda1daa..4170592be7ee 100755 --- a/examples/usdt_sample/scripts/latency.py +++ b/examples/usdt_sample/scripts/latency.py @@ -114,4 +114,4 @@ def print_event(cpu, data, size): # Output latency events bpf_ctx["operation_event"].open_perf_buffer(print_event) while 1: - bpf_ctx.kprobe_poll() + bpf_ctx.perf_buffer_poll() diff --git a/src/lua/bcc/bpf.lua b/src/lua/bcc/bpf.lua index cff6c356e71b..fa987f3851bd 100644 --- a/src/lua/bcc/bpf.lua +++ b/src/lua/bcc/bpf.lua @@ -276,7 +276,7 @@ function Bpf:_perf_buffer_array() return readers, n end -function Bpf:kprobe_poll_loop() +function Bpf:perf_buffer_poll_loop() local perf_buffers, perf_buffer_count = self:_perf_buffer_array() return pcall(function() while true do @@ -285,9 +285,17 @@ function Bpf:kprobe_poll_loop() end) end -function Bpf:kprobe_poll(timeout) +function Bpf:kprobe_poll_loop() + return self:perf_buffer_poll_loop() +end + +function Bpf:perf_buffer_poll(timeout) local perf_buffers, perf_buffer_count = self:_perf_buffer_array() libbcc.perf_reader_poll(perf_buffer_count, perf_buffers, timeout or -1) end +function Bpf:kprobe_poll(timeout) + self:perf_buffer_poll(timeout) +end + return Bpf diff --git a/src/python/bcc/__init__.py b/src/python/bcc/__init__.py index ef4bc282f712..d3fb363f536e 100644 --- a/src/python/bcc/__init__.py +++ b/src/python/bcc/__init__.py @@ -1100,11 +1100,11 @@ def num_open_tracepoints(self): """ return len(self.tracepoint_fds) - def kprobe_poll(self, timeout = -1): - """kprobe_poll(self) + def perf_buffer_poll(self, timeout = -1): + """perf_buffer_poll(self) - Poll from the ring buffers for all of the open kprobes, calling the - cb() that was given in the BPF constructor for each entry. + Poll from all open perf ring buffers, calling the callback that was + provided when calling open_perf_buffer for each entry. """ try: readers = (ct.c_void_p * len(self.perf_buffers))() @@ -1114,6 +1114,13 @@ def kprobe_poll(self, timeout = -1): except KeyboardInterrupt: exit() + def kprobe_poll(self, timeout = -1): + """kprobe_poll(self) + + Deprecated. Use perf_buffer_poll instead. + """ + self.perf_buffer_poll(timeout) + def donothing(self): """the do nothing exit handler""" diff --git a/tests/python/test_array.py b/tests/python/test_array.py index df35d73bb03d..b76831a4a73b 100755 --- a/tests/python/test_array.py +++ b/tests/python/test_array.py @@ -65,7 +65,7 @@ def lost_cb(lost): b = BPF(text=text) b["events"].open_perf_buffer(cb, lost_cb=lost_cb) time.sleep(0.1) - b.kprobe_poll() + b.perf_buffer_poll() self.assertGreater(self.counter, 0) b.cleanup() @@ -98,7 +98,7 @@ def lost_cb(lost): online_cpus = get_online_cpus() for cpu in online_cpus: subprocess.call(['taskset', '-c', str(cpu), 'sleep', '0.1']) - b.kprobe_poll() + b.perf_buffer_poll() b.cleanup() self.assertGreaterEqual(len(self.events), len(online_cpus), 'Received only {}/{} events'.format(len(self.events), len(online_cpus))) diff --git a/tests/python/test_usdt.py b/tests/python/test_usdt.py index d1f0ca0fefae..ef578c3b1036 100755 --- a/tests/python/test_usdt.py +++ b/tests/python/test_usdt.py @@ -213,7 +213,7 @@ def print_event5(cpu, data, size): # three iterations to make sure we get some probes and have time to process them for i in range(3): - b.kprobe_poll() + b.perf_buffer_poll() self.assertTrue(self.evt_st_1 == 1 and self.evt_st_2 == 1 and self.evt_st_3 == 1) def tearDown(self): diff --git a/tests/python/test_usdt2.py b/tests/python/test_usdt2.py index 5408b424cdc2..066b1673d479 100755 --- a/tests/python/test_usdt2.py +++ b/tests/python/test_usdt2.py @@ -150,7 +150,7 @@ def print_event6(cpu, data, size): # three iterations to make sure we get some probes and have time to process them for i in range(3): - b.kprobe_poll() + b.perf_buffer_poll() # note that event1 and event4 do not really fire, so their state should be 0 # use separate asserts so that if test fails we know which one is the culprit diff --git a/tests/python/test_usdt3.py b/tests/python/test_usdt3.py index 61b1f63967ab..864d70660aa6 100755 --- a/tests/python/test_usdt3.py +++ b/tests/python/test_usdt3.py @@ -132,7 +132,7 @@ def print_event(cpu, data, size): b["event"].open_perf_buffer(print_event) for i in range(10): - b.kprobe_poll() + b.perf_buffer_poll() self.assertTrue(self.probe_value_1 != 0) self.assertTrue(self.probe_value_2 != 0) diff --git a/tools/bashreadline.py b/tools/bashreadline.py index 0be8b26d56cb..aaf6fc7ce7ab 100755 --- a/tools/bashreadline.py +++ b/tools/bashreadline.py @@ -61,4 +61,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/biosnoop.lua b/tools/biosnoop.lua index 0aaebd58d5e3..705212ee7602 100755 --- a/tools/biosnoop.lua +++ b/tools/biosnoop.lua @@ -189,5 +189,5 @@ return function(BPF, utils) char name[$]; } ]], {DISK_NAME_LEN, TASK_COMM_LEN}, 64) - bpf:kprobe_poll_loop() + bpf:perf_buffer_poll_loop() end diff --git a/tools/biosnoop.py b/tools/biosnoop.py index 314a19e3400b..32d83e5e91d7 100755 --- a/tools/biosnoop.py +++ b/tools/biosnoop.py @@ -185,4 +185,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/btrfsslower.py b/tools/btrfsslower.py index 56230183ad92..a84a5116e0a3 100755 --- a/tools/btrfsslower.py +++ b/tools/btrfsslower.py @@ -350,4 +350,4 @@ def print_event(cpu, data, size): # read events b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/capable.py b/tools/capable.py index 83bfd98dc61c..3e032e9ace2e 100755 --- a/tools/capable.py +++ b/tools/capable.py @@ -154,4 +154,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/cpuunclaimed.py b/tools/cpuunclaimed.py index 95d88b84395b..b862bad27c52 100755 --- a/tools/cpuunclaimed.py +++ b/tools/cpuunclaimed.py @@ -218,7 +218,7 @@ def print_event(cpu, data, size): sleep(wakeup_s) except KeyboardInterrupt: exiting = 1 - b.kprobe_poll() + b.perf_buffer_poll() slept += wakeup_s if slept < 0.999 * interval: # floating point workaround diff --git a/tools/dbslower.py b/tools/dbslower.py index e5578dbea074..c523d7a3458a 100755 --- a/tools/dbslower.py +++ b/tools/dbslower.py @@ -230,4 +230,4 @@ def print_event(cpu, data, size): bpf["events"].open_perf_buffer(print_event, page_cnt=64) while True: - bpf.kprobe_poll() + bpf.perf_buffer_poll() diff --git a/tools/dcsnoop.py b/tools/dcsnoop.py index 39064c9397a1..070c87aad67f 100755 --- a/tools/dcsnoop.py +++ b/tools/dcsnoop.py @@ -161,4 +161,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/execsnoop.py b/tools/execsnoop.py index 77f44ae6911a..b4251ea2fc3f 100755 --- a/tools/execsnoop.py +++ b/tools/execsnoop.py @@ -212,4 +212,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/ext4slower.py b/tools/ext4slower.py index 6ec87da9a9ba..01c74efc4bd7 100755 --- a/tools/ext4slower.py +++ b/tools/ext4slower.py @@ -344,4 +344,4 @@ def print_event(cpu, data, size): # read events b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/filelife.py b/tools/filelife.py index a613304641f3..6756f31a9a76 100755 --- a/tools/filelife.py +++ b/tools/filelife.py @@ -140,4 +140,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/fileslower.py b/tools/fileslower.py index 0f58d9184c02..04e2e617ff11 100755 --- a/tools/fileslower.py +++ b/tools/fileslower.py @@ -249,4 +249,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/funcslower.py b/tools/funcslower.py index 55219f2dd726..959a5af3d6a0 100755 --- a/tools/funcslower.py +++ b/tools/funcslower.py @@ -231,4 +231,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event, page_cnt=64) while True: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/gethostlatency.py b/tools/gethostlatency.py index 7bbd792b5174..f1d7dea7cd97 100755 --- a/tools/gethostlatency.py +++ b/tools/gethostlatency.py @@ -135,4 +135,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/killsnoop.py b/tools/killsnoop.py index 9d86930dc299..d3f963c06f7e 100755 --- a/tools/killsnoop.py +++ b/tools/killsnoop.py @@ -140,4 +140,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/lib/uflow.py b/tools/lib/uflow.py index 1b59bca85e39..025a19370f5a 100755 --- a/tools/lib/uflow.py +++ b/tools/lib/uflow.py @@ -188,4 +188,4 @@ def print_event(cpu, data, size): bpf["calls"].open_perf_buffer(print_event) while 1: - bpf.kprobe_poll() + bpf.perf_buffer_poll() diff --git a/tools/lib/ugc.py b/tools/lib/ugc.py index 2da265be393b..9f4d2582f0d5 100755 --- a/tools/lib/ugc.py +++ b/tools/lib/ugc.py @@ -239,4 +239,4 @@ def print_event(cpu, data, size): bpf["gcs"].open_perf_buffer(print_event) while 1: - bpf.kprobe_poll() + bpf.perf_buffer_poll() diff --git a/tools/lib/uthreads.py b/tools/lib/uthreads.py index b5bed53039a1..a96750fdd896 100755 --- a/tools/lib/uthreads.py +++ b/tools/lib/uthreads.py @@ -120,4 +120,4 @@ def print_event(cpu, data, size): bpf["threads"].open_perf_buffer(print_event) while 1: - bpf.kprobe_poll() + bpf.perf_buffer_poll() diff --git a/tools/mdflush.py b/tools/mdflush.py index 35ed31a2079b..15ad79ea4f37 100755 --- a/tools/mdflush.py +++ b/tools/mdflush.py @@ -77,4 +77,4 @@ def print_event(cpu, data, size): # read events b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/mountsnoop.py b/tools/mountsnoop.py index abb39d3a9f09..6f92ef4c02be 100755 --- a/tools/mountsnoop.py +++ b/tools/mountsnoop.py @@ -408,7 +408,7 @@ def main(): print('{:16} {:<7} {:<7} {:<11} {}'.format( 'COMM', 'PID', 'TID', 'MNT_NS', 'CALL')) while True: - b.kprobe_poll() + b.perf_buffer_poll() if __name__ == '__main__': diff --git a/tools/mysqld_qslower.py b/tools/mysqld_qslower.py index 3ed18ec6daaa..d76077354ef2 100755 --- a/tools/mysqld_qslower.py +++ b/tools/mysqld_qslower.py @@ -130,4 +130,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/nfsslower.py b/tools/nfsslower.py index 724b05b0a54d..0f836afcadbb 100755 --- a/tools/nfsslower.py +++ b/tools/nfsslower.py @@ -325,4 +325,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/oomkill.py b/tools/oomkill.py index f0837f0ebf8f..e8e0321576ff 100755 --- a/tools/oomkill.py +++ b/tools/oomkill.py @@ -76,4 +76,4 @@ def print_event(cpu, data, size): print("Tracing OOM kills... Ctrl-C to stop.") b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/opensnoop.py b/tools/opensnoop.py index 7c16c02089ff..e1a010879213 100755 --- a/tools/opensnoop.py +++ b/tools/opensnoop.py @@ -192,4 +192,4 @@ def print_event(cpu, data, size): b["events"].open_perf_buffer(print_event, page_cnt=64) start_time = datetime.now() while not args.duration or datetime.now() - start_time < args.duration: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/solisten.py b/tools/solisten.py index 57f27ce474f6..6a35f82ba465 100755 --- a/tools/solisten.py +++ b/tools/solisten.py @@ -210,4 +210,4 @@ def print_event(cpu, data, size): # Read events while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/sslsniff.py b/tools/sslsniff.py index e8e2c13709d9..174577b0fa79 100755 --- a/tools/sslsniff.py +++ b/tools/sslsniff.py @@ -210,4 +210,4 @@ def print_event(cpu, data, size, rw): b["perf_SSL_write"].open_perf_buffer(print_event_write) b["perf_SSL_read"].open_perf_buffer(print_event_read) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/stacksnoop.lua b/tools/stacksnoop.lua index 0e0ad979d1d1..5bcef8c4828f 100755 --- a/tools/stacksnoop.lua +++ b/tools/stacksnoop.lua @@ -103,5 +103,5 @@ return function(BPF, utils) bpf:get_table("events"):open_perf_buffer(print_event, "struct { uint64_t stack_id; uint32_t pid; char comm[$]; }", {TASK_COMM_LEN}) - bpf:kprobe_poll_loop() + bpf:perf_buffer_poll_loop() end diff --git a/tools/statsnoop.py b/tools/statsnoop.py index 6d0a2810f1b9..7054b5bac758 100755 --- a/tools/statsnoop.py +++ b/tools/statsnoop.py @@ -175,4 +175,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/syncsnoop.py b/tools/syncsnoop.py index 90dcb2098fec..6b0d2b1876fc 100755 --- a/tools/syncsnoop.py +++ b/tools/syncsnoop.py @@ -48,4 +48,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/tcpaccept.py b/tools/tcpaccept.py index a9e627d4d9e5..d92301f2f849 100755 --- a/tools/tcpaccept.py +++ b/tools/tcpaccept.py @@ -194,4 +194,4 @@ def print_ipv6_event(cpu, data, size): b["ipv4_events"].open_perf_buffer(print_ipv4_event) b["ipv6_events"].open_perf_buffer(print_ipv6_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/tcpconnect.py b/tools/tcpconnect.py index dbade83062e2..fe793ad55f73 100755 --- a/tools/tcpconnect.py +++ b/tools/tcpconnect.py @@ -237,4 +237,4 @@ def print_ipv6_event(cpu, data, size): b["ipv4_events"].open_perf_buffer(print_ipv4_event) b["ipv6_events"].open_perf_buffer(print_ipv6_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/tcpconnlat.py b/tools/tcpconnlat.py index 5f7404ec86ba..8bfeb1e9bbfb 100755 --- a/tools/tcpconnlat.py +++ b/tools/tcpconnlat.py @@ -265,4 +265,4 @@ def print_ipv6_event(cpu, data, size): b["ipv4_events"].open_perf_buffer(print_ipv4_event) b["ipv6_events"].open_perf_buffer(print_ipv6_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/tcplife.lua b/tools/tcplife.lua index 7dc9364c7890..60fb51f08392 100755 --- a/tools/tcplife.lua +++ b/tools/tcplife.lua @@ -435,5 +435,5 @@ return function(BPF, utils) } ]], {TASK_COMM_LEN}, 64) - bpf:kprobe_poll_loop() + bpf:perf_buffer_poll_loop() end diff --git a/tools/tcplife.py b/tools/tcplife.py index ac02a340e778..5a588309501b 100755 --- a/tools/tcplife.py +++ b/tools/tcplife.py @@ -497,4 +497,4 @@ def print_ipv6_event(cpu, data, size): b["ipv4_events"].open_perf_buffer(print_ipv4_event, page_cnt=64) b["ipv6_events"].open_perf_buffer(print_ipv6_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/tcpretrans.py b/tools/tcpretrans.py index b94abbcc7368..fe36fb9bb384 100755 --- a/tools/tcpretrans.py +++ b/tools/tcpretrans.py @@ -300,4 +300,4 @@ def depict_cnt(counts_tab, l3prot='ipv4'): b["ipv4_events"].open_perf_buffer(print_ipv4_event) b["ipv6_events"].open_perf_buffer(print_ipv6_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/tcptracer.py b/tools/tcptracer.py index 5bec83c313ab..8290d40311c3 100755 --- a/tools/tcptracer.py +++ b/tools/tcptracer.py @@ -670,4 +670,4 @@ def inet_ntoa(addr): b["tcp_ipv4_event"].open_perf_buffer(print_ipv4_event) b["tcp_ipv6_event"].open_perf_buffer(print_ipv6_event) while True: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/trace.py b/tools/trace.py index e257fc11b023..bec8f1081efd 100755 --- a/tools/trace.py +++ b/tools/trace.py @@ -729,7 +729,7 @@ def _main_loop(self): "-" if not all_probes_trivial else "")) while True: - self.bpf.kprobe_poll() + self.bpf.perf_buffer_poll() def run(self): try: diff --git a/tools/ttysnoop.py b/tools/ttysnoop.py index d0981a493993..e9344865f9d9 100755 --- a/tools/ttysnoop.py +++ b/tools/ttysnoop.py @@ -121,4 +121,4 @@ def print_event(cpu, data, size): # loop with callback to print_event b["events"].open_perf_buffer(print_event) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/xfsslower.py b/tools/xfsslower.py index 59dc246b14ba..5055dd37a593 100755 --- a/tools/xfsslower.py +++ b/tools/xfsslower.py @@ -299,4 +299,4 @@ def print_event(cpu, data, size): # read events b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll() diff --git a/tools/zfsslower.py b/tools/zfsslower.py index dbd85759cf22..53c566fa2071 100755 --- a/tools/zfsslower.py +++ b/tools/zfsslower.py @@ -317,4 +317,4 @@ def print_event(cpu, data, size): # read events b["events"].open_perf_buffer(print_event, page_cnt=64) while 1: - b.kprobe_poll() + b.perf_buffer_poll()