Commit 41f6a1eb authored by Brendan Gregg's avatar Brendan Gregg

Merge pull request #468 from goldshtn/trace-which

Replaced `which --skip-alias` with `ProcUtils.which`
parents 7cf96a44 435839a9
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# Licensed under the Apache License, Version 2.0 (the "License") # Licensed under the Apache License, Version 2.0 (the "License")
# Copyright (C) 2016 Sasha Goldshtein. # Copyright (C) 2016 Sasha Goldshtein.
from bcc import BPF, Tracepoint, Perf, USDTReader from bcc import BPF, Tracepoint, Perf, ProcUtils, USDTReader
from time import sleep, strftime from time import sleep, strftime
import argparse import argparse
import re import re
...@@ -416,10 +416,7 @@ BPF_PERF_OUTPUT(%s); ...@@ -416,10 +416,7 @@ BPF_PERF_OUTPUT(%s);
libpath = BPF.find_library(self.library) libpath = BPF.find_library(self.library)
if libpath is None: if libpath is None:
# This might be an executable (e.g. 'bash') # This might be an executable (e.g. 'bash')
with os.popen( libpath = ProcUtils.which(self.library)
"/usr/bin/which --skip-alias %s 2>/dev/null" %
self.library) as w:
libpath = w.read().strip()
if libpath is None or len(libpath) == 0: if libpath is None or len(libpath) == 0:
self._bail("unable to find library %s" % self.library) self._bail("unable to find library %s" % self.library)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment