Edit perf_event cc and python tests with pid argument

iovisor · Jul 30, 2023 · 612399d · 612399d
1 parent 3360c79
commit 612399d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/tests/cc/test_perf_event.cc b/tests/cc/test_perf_event.cc
@@ -59,8 +59,9 @@ TEST_CASE("test read perf event", "[bpf_perf_event]") {
       BPF_PROGRAM,
       {"-DNUM_CPUS=" + std::to_string(sysconf(_SC_NPROCESSORS_ONLN))}, {});
   REQUIRE(res.ok());
+  int pid = getpid();
   res =
-      bpf.open_perf_event("cnt", PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_CLOCK);
+      bpf.open_perf_event("cnt", PERF_TYPE_SOFTWARE, PERF_COUNT_SW_CPU_CLOCK, pid);
   REQUIRE(res.ok());
   std::string getuid_fnname = bpf.get_syscall_fnname("getuid");
   res = bpf.attach_kprobe(getuid_fnname, "on_sys_getuid");

diff --git a/tests/python/test_perf_event.py b/tests/python/test_perf_event.py
@@ -40,14 +40,16 @@ def test_cycles(self):
     return 0;
 }
 """
+        mypid = os.getpid()
         b = bcc.BPF(text=text, debug=0,
                 cflags=["-DNUM_CPUS=%d" % multiprocessing.cpu_count()])
         event_name = b.get_syscall_fnname(b"getuid")
         b.attach_kprobe(event=event_name, fn_name=b"do_sys_getuid")
         b.attach_kretprobe(event=event_name, fn_name=b"do_ret_sys_getuid")
         cnt1 = b[b"cnt1"]
         try:
-            cnt1.open_perf_event(bcc.PerfType.HARDWARE, bcc.PerfHWConfig.CPU_CYCLES)
+            cnt1.open_perf_event(bcc.PerfType.HARDWARE,
+                                 bcc.PerfHWConfig.CPU_CYCLES, pid=mypid)
         except:
             if ctypes.get_errno() == 2:
                 raise self.skipTest("hardware events unsupported")