passenger 5.0.30 → 5.1.0

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/app.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #
-# Copyright (c) 2010-2015 Phusion
+# Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,6 +23,7 @@
 
 require 'optparse'
 PhusionPassenger.require_passenger_lib 'vendor/crash_watch/gdb_controller'
+PhusionPassenger.require_passenger_lib 'vendor/crash_watch/lldb_controller'
 PhusionPassenger.require_passenger_lib 'vendor/crash_watch/version'
 
 module CrashWatch
@@ -68,7 +69,11 @@ module CrashWatch
       end
 
       begin
-        gdb = CrashWatch::GdbController.new
+        if !CrashWatch::Utils.gdb_installed? && CrashWatch::Utils.lldb_installed?
+          gdb = CrashWatch::LldbController.new
+        else
+          gdb = CrashWatch::GdbController.new
+        end
       rescue CrashWatch::Error => e
         abort e.message
       end
@@ -101,14 +106,18 @@ module CrashWatch
             output.gsub!(/^    (Thread .*):$/, "########### \\1 ###########\n")
             puts output
           else
-            puts "Monitoring PID #{argv[0]}..."
-            exit_info = gdb.wait_until_exit
-            puts "Process exited at #{Time.now}."
-            puts "Exit code: #{exit_info.exit_code}" if exit_info.exit_code
-            puts "Signal: #{exit_info.signal}" if exit_info.signaled?
-            if exit_info.backtrace
-              puts "Backtrace:"
-              puts "    " << exit_info.backtrace.gsub(/\n/, "\n    ")
+            if gdb.respond_to?(:wait_until_exit)
+              puts "Monitoring PID #{argv[0]}..."
+              exit_info = gdb.wait_until_exit
+              puts "Process exited at #{Time.now}."
+              puts "Exit code: #{exit_info.exit_code}" if exit_info.exit_code
+              puts "Signal: #{exit_info.signal}" if exit_info.signaled?
+              if exit_info.backtrace
+                puts "Backtrace:"
+                puts "    " << exit_info.backtrace.gsub(/\n/, "\n    ")
+              end
+            else
+              abort "ERROR: monitoring not supported with LLDB"
             end
           end
         else

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/base.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2016 Phusion Holding B.V.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module CrashWatch
+  class Error < StandardError
+  end
+end

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/gdb_controller.rb

@@ -1,6 +1,6 @@
 # encoding: binary
 #
-# Copyright (c) 2010-2015 Phusion
+# Copyright (c) 2010-2016 Phusion Holding B.V.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,11 +22,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'rbconfig'
+PhusionPassenger.require_passenger_lib 'vendor/crash_watch/base'
+PhusionPassenger.require_passenger_lib 'vendor/crash_watch/utils'
 
 module CrashWatch
-  class Error < StandardError
-  end
-
   class GdbNotFound < Error
   end
 
@@ -36,28 +35,28 @@ module CrashWatch
   class GdbController
     class ExitInfo
       attr_reader :exit_code, :signal, :backtrace, :snapshot
-      
+
       def initialize(exit_code, signal, backtrace, snapshot)
         @exit_code = exit_code
         @signal = signal
         @backtrace = backtrace
         @snapshot = snapshot
       end
-      
+
       def signaled?
         !!@signal
       end
     end
-    
+
     END_OF_RESPONSE_MARKER = '--------END_OF_RESPONSE--------'
-    
+
     attr_accessor :debug
 
     def initialize
-      @pid, @in, @out = popen_command(find_gdb, "-n", "-q")
+      @pid, @in, @out = Utils.popen_command(find_gdb, "-n", "-q")
       execute("set prompt ")
     end
-    
+
     def execute(command_string, timeout = nil)
       raise "GDB session is already closed" if !@pid
       puts "gdb write #{command_string.inspect}" if @debug
@@ -86,11 +85,11 @@ module CrashWatch
       end
       result
     end
-    
+
     def closed?
       !@pid
     end
-    
+
     def close
       if !closed?
         begin
@@ -106,7 +105,7 @@ module CrashWatch
         end
       end
     end
-    
+
     def close!
       if !closed?
         @in.close
@@ -116,86 +115,48 @@ module CrashWatch
         @pid = nil
       end
     end
-    
+
     def attach(pid)
       pid = pid.to_s.strip
       raise ArgumentError if pid.empty?
       result = execute("attach #{pid}")
       result !~ /(No such process|Unable to access task|Operation not permitted)/
     end
-    
-    def call(code)
-      result = execute("call #{code}")
-      result =~ /= (.*)$/
-      $1
-    end
-    
+
     def program_counter
       execute("p/x $pc").gsub(/.* = /, '')
     end
-    
+
     def current_thread
       execute("thread") =~ /Current thread is (.+?) /
       $1
     end
-    
+
     def current_thread_backtrace
       execute("bt full").strip
     end
-    
+
     def all_threads_backtraces
       execute("thread apply all bt full").strip
     end
-    
-    def ruby_backtrace
-      filename = "/tmp/gdb-capture.#{@pid}.txt"
-      
-      orig_stdout_fd_copy = call("(int) dup(1)")
-      new_stdout = call(%Q{(void *) fopen("#{filename}", "w")})
-      new_stdout_fd = call("(int) fileno(#{new_stdout})")
-      call("(int) dup2(#{new_stdout_fd}, 1)")
-      
-      # Let's hope stdout is set to line buffered or unbuffered mode...
-      call("(void) rb_backtrace()")
-      
-      call("(int) dup2(#{orig_stdout_fd_copy}, 1)")
-      call("(int) fclose(#{new_stdout})")
-      call("(int) close(#{orig_stdout_fd_copy})")
-      
-      if File.exist?(filename)
-        result = File.read(filename)
-        result.strip!
-        if result.empty?
-          nil
-        else
-          result
-        end
-      else
-        nil
-      end
-    ensure
-      if filename
-        File.unlink(filename) rescue nil
-      end
-    end
-    
+
     def wait_until_exit
       execute("break _exit")
-      
+
       signal = nil
       backtraces = nil
       snapshot = nil
-      
+
       while true
         result = execute("continue")
-        if result =~ /^Program received signal (.+?),/
-          signal = $1
+        if result =~ /^(Program|Thread .*) received signal (.+?),/
+          signal = $2
           backtraces = execute("thread apply all bt full").strip
           if backtraces.empty?
             backtraces = execute("bt full").strip
           end
           snapshot = yield(self) if block_given?
-          
+
           # This signal may or may not be immediately fatal; the
           # signal might be ignored by the process, or the process
           # has some clever signal handler that fixes the state,
@@ -204,12 +165,12 @@ module CrashWatch
           # the next machine instruction.
           old_program_counter = program_counter
           result = execute("stepi")
-          if result =~ /^Program received signal .+?,/
+          if result =~ /^(Program|Thread .*) received signal .+?,/
             # Yes, it was fatal. Here we don't care whether the
             # instruction caused a different signal. The last
             # one is probably what we're interested in.
             return ExitInfo.new(nil, signal, backtraces, snapshot)
-          elsif result =~ /^Program (terminated|exited)/ || result =~ /^Breakpoint .*? _exit/
+          elsif result =~ /^Program (terminated|exited)/ || result =~ /^Breakpoint .*? (__GI_)?_exit/
             # Running the next instruction causes the program to terminate.
             # Not sure what's going on but the previous signal and
             # backtrace is probably what we're interested in.
@@ -230,7 +191,8 @@ module CrashWatch
           else
             return ExitInfo.new(nil, signal, nil, snapshot)
           end
-        elsif result =~ /^Breakpoint .*? _exit /
+        elsif result =~ /Breakpoint .*? (__GI_)?_exit (\(status=(\d+)\))?/
+          status_param = $3
           backtraces = execute("thread apply all bt full").strip
           if backtraces.empty?
             backtraces = execute("bt full").strip
@@ -240,53 +202,26 @@ module CrashWatch
           # even though the process exited. Kernel bug? In any case,
           # we put a timeout here so that we don't wait indefinitely.
           result = execute("continue", 10)
-          if result =~ /^Program exited with code (\d+)\.$/
-            return ExitInfo.new($1.to_i, nil, backtraces, snapshot)
-          elsif result =~ /^Program exited normally/
+          if result =~ /^(Program|.*process .*) exited with code (\d+)/
+            return ExitInfo.new($2.to_i, nil, backtraces, snapshot)
+          elsif result =~ /^(Program|.*process .*) exited normally/
             return ExitInfo.new(0, nil, backtraces, snapshot)
-          else
+          elsif status_param.nil? || status_param.empty?
             return ExitInfo.new(nil, nil, backtraces, snapshot)
+          else
+            return ExitInfo.new(status_param.to_i, nil, backtraces, snapshot)
           end
-        elsif result =~ /^Program exited with code (\d+)\.$/
-          return ExitInfo.new($1.to_i, nil, nil, nil)
-        elsif result =~ /^Program exited normally/
+        elsif result =~ /^(Program|.*process .*) exited with code (\d+)\.$/
+          return ExitInfo.new($2.to_i, nil, nil, nil)
+        elsif result =~ /^(Program|.*process .*) exited normally/
           return ExitInfo.new(0, nil, nil, nil)
         else
           return ExitInfo.new(nil, nil, nil, nil)
         end
       end
     end
-    
-  private
-    def popen_command(*command)
-      a, b = IO.pipe
-      c, d = IO.pipe
-      if Process.respond_to?(:spawn)
-        args = command.dup
-        args << {
-          STDIN  => a,
-          STDOUT => d,
-          STDERR => d,
-          :close_others => true
-        }
-        pid = Process.spawn(*args)
-      else
-        pid = fork do
-          STDIN.reopen(a)
-          STDOUT.reopen(d)
-          STDERR.reopen(d)
-          b.close
-          c.close
-          exec(*command)
-        end
-      end
-      a.close
-      d.close
-      b.binmode
-      c.binmode
-      [pid, b, c]
-    end
 
+  private
     def find_gdb
       result = nil
       if ENV['GDB'] && File.executable?(ENV['GDB'])
@@ -328,7 +263,7 @@ module CrashWatch
         end
       elsif result.nil?
         raise GdbNotFound,
-          "*** ERROR ***: 'gdb' not found. Please install it (and if using Nginx " + 
+          "*** ERROR ***: 'gdb' not found. Please install it (and if using Nginx " +
           "ensure that PATH isn't filtered out, see also its \"env\" option).\n" +
           "       Debian/Ubuntu: sudo apt-get install gdb\n" +
           "RedHat/CentOS/Fedora: sudo yum install gdb\n" +

data/src/ruby_supportlib/phusion_passenger/vendor/crash_watch/lldb_controller.rb

@@ -0,0 +1,178 @@
+# encoding: binary
+#
+# Copyright (c) 2016 Phusion Holding B.V.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'rbconfig'
+PhusionPassenger.require_passenger_lib 'vendor/crash_watch/base'
+PhusionPassenger.require_passenger_lib 'vendor/crash_watch/utils'
+
+module CrashWatch
+  class LldbNotFound < Error
+  end
+
+  class LldbController
+    class ExitInfo
+      attr_reader :exit_code, :signal, :backtrace, :snapshot
+
+      def initialize(exit_code, signal, backtrace, snapshot)
+        @exit_code = exit_code
+        @signal = signal
+        @backtrace = backtrace
+        @snapshot = snapshot
+      end
+
+      def signaled?
+        !!@signal
+      end
+    end
+
+    END_OF_RESPONSE_MARKER = '--------END_OF_RESPONSE--------'
+
+    attr_accessor :debug
+
+    def initialize
+      @pid, @in, @out = Utils.popen_command(find_lldb, "-x")
+      execute("settings set prompt 'LLDB:'")
+      execute("settings set auto-confirm false")
+    end
+
+    def execute(command_string, timeout = nil)
+      raise "LLDB session is already closed" if !@pid
+      puts "lldb write #{command_string.inspect}" if @debug
+      marker = "\n#{END_OF_RESPONSE_MARKER}\n"
+      @in.puts(command_string)
+      @in.puts("script print #{marker.inspect}")
+      done = false
+      result = []
+      while !done
+        begin
+          if select([@out], nil, nil, timeout)
+            line = @out.readline.chomp
+            line.sub!(/^LLDB:/, '')
+            puts "lldb read #{line.inspect}" if @debug
+            if line == "#{END_OF_RESPONSE_MARKER}"
+              done = true
+            else
+              result << line
+            end
+          else
+            close!
+            done = true
+            result = nil
+          end
+        rescue EOFError
+          done = true
+        end
+      end
+
+      if result
+        # Remove echo of the command string
+        result.slice!(0, 2)
+        # Remove echo of the marker print command
+        result.pop
+        result.pop
+
+        result.join("\n") << "\n"
+      else
+        nil
+      end
+    end
+
+    def closed?
+      !@pid
+    end
+
+    def close
+      if !closed?
+        begin
+          execute("process detach", 5) if !closed?
+          execute("quit", 5) if !closed?
+        rescue Errno::EPIPE
+        end
+        if !closed?
+          @in.close
+          @out.close
+          Process.waitpid(@pid)
+          @pid = nil
+        end
+      end
+    end
+
+    def close!
+      if !closed?
+        @in.close
+        @out.close
+        Process.kill('KILL', @pid)
+        Process.waitpid(@pid)
+        @pid = nil
+      end
+    end
+
+    def attach(pid)
+      pid = pid.to_s.strip
+      raise ArgumentError if pid.empty?
+      result = execute("attach -p #{pid}")
+      result !~ /(unable to attach|cannot attach)/
+    end
+
+    def program_counter
+      execute("p/x $pc").gsub(/.* = /, '')
+    end
+
+    def current_thread
+      execute("thread info") =~ /^thread #(.+?): /
+      $1
+    end
+
+    def current_thread_backtrace
+      execute("bt").strip
+    end
+
+    def all_threads_backtraces
+      execute("bt all").strip
+    end
+
+  private
+    def find_lldb
+      result = nil
+      if ENV['LLDB'] && File.executable?(ENV['LLDB'])
+        result = ENV['LLDB']
+      else
+        ENV['PATH'].to_s.split(/:+/).each do |path|
+          filename = "#{path}/lldb"
+          if File.file?(filename) && File.executable?(filename)
+            result = filename
+            break
+          end
+        end
+      end
+
+      puts "Found lldb at: #{result}" if result
+
+      if result.nil?
+        raise LldbNotFound
+      else
+        result
+      end
+    end
+  end
+end