From 039a8ef78673f851e39b43980376c2af40d5cbbc Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 6 May 2020 10:09:29 +0900 Subject: leakchecker.rb: search /dev/fd too It is more popular than /proc/self/fd. --- tool/lib/leakchecker.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tool') diff --git a/tool/lib/leakchecker.rb b/tool/lib/leakchecker.rb index 03eb5391c4..293ebe6a9a 100644 --- a/tool/lib/leakchecker.rb +++ b/tool/lib/leakchecker.rb @@ -35,19 +35,19 @@ class LeakChecker if IO.respond_to?(:console) and (m = IO.method(:console)).arity.nonzero? m[:close] end - fd_dir = "/proc/self/fd" - if File.directory?(fd_dir) - fds = Dir.open(fd_dir) {|d| - a = d.grep(/\A\d+\z/, &:to_i) - if d.respond_to? :fileno - a -= [d.fileno] - end - a - } - fds.sort - else - [] + %w"/proc/self/fd /dev/fd".each do |fd_dir| + if File.directory?(fd_dir) + fds = Dir.open(fd_dir) {|d| + a = d.grep(/\A\d+\z/, &:to_i) + if d.respond_to? :fileno + a -= [d.fileno] + end + a + } + return fds.sort + end end + [] end def check_fd_leak(test_name) -- cgit v1.2.3