bpflist: Add to tests and use Python directory listing

This commit adds bpflist to the smoke tests suite (omitted by mistake), and switches to listing file descriptors using Python's `os` module instead of relying on `ls` glob expansion, which is fragile when there are many processes with many fds.
hloeffler · Feb 14, 2017 · 563af79 · 563af79
1 parent f387f5d
commit 563af79
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/tests/python/test_tools_smoke.py b/tests/python/test_tools_smoke.py
@@ -76,6 +76,9 @@ def test_biotop(self):
     def test_bitesize(self):
         self.run_with_int("biotop.py")
 
+    def test_bpflist(self):
+        self.run_with_duration("bpflist.py")
+
     def test_btrfsdist(self):
         # Will attempt to do anything meaningful only when btrfs is installed.
         self.run_with_duration("btrfsdist.py 1 1")

diff --git a/tools/bpflist.py b/tools/bpflist.py
@@ -15,6 +15,7 @@
 from bcc import BPF, USDT
 import argparse
 import re
+import os
 import subprocess
 
 examples = """examples:
@@ -54,16 +55,21 @@ def parse_probes(typ):
     parse_probes("kprobe")
     parse_probes("uprobe")
 
-cmd = "ls -l /proc/*/fd/* | grep bpf"
-p = subprocess.Popen(cmd, shell=True,
-                     stderr=subprocess.PIPE, stdout=subprocess.PIPE)
-for line in p.stdout:
-   match = re.search('/proc/(\\d+)/fd/\\d+.*bpf-(\\w+)', line)
-   if match is None:
-       continue
-   pid = int(match.group(1))
-   t = match.group(2)
-   counts[(pid, t)] = counts.get((pid, t), 0) + 1
+def find_bpf_fds(pid):
+    root = '/proc/%d/fd' % pid
+    for fd in os.listdir(root):
+        try:
+            link = os.readlink(os.path.join(root, fd))
+        except OSError:
+            continue
+        match = re.match('.*bpf-(\\w+)', link)
+        if match:
+            tup = (pid, match.group(1))
+            counts[tup] = counts.get(tup, 0) + 1
+
+for pdir in os.listdir('/proc'):
+    if re.match('\\d+', pdir):
+        find_bpf_fds(int(pdir))
 
 print("%-6s %-16s %-8s %s" % ("PID", "COMM", "TYPE", "COUNT"))
 for (pid, typ), count in sorted(counts.items(), key=lambda t: t[0][0]):