passenger 3.0.0.pre2 → 3.0.0.pre3

data/bin/passenger-status

@@ -111,7 +111,7 @@ def show_status(server_instance, options = {})
 rescue ServerInstance::RoleDeniedError
 	require 'phusion_passenger/platform_info/ruby'
 	STDERR.puts "*** ERROR: You are not authorized to query the status for this Phusion " <<
-		"Passenger instance. Please try again with '#{PlatformInfo.ruby_sudo_command}'."
+		"Passenger instance. Please try again with '#{PhusionPassenger::PlatformInfo.ruby_sudo_command}'."
 	exit 2
 end
 

data/build/packaging.rb

@@ -93,7 +93,7 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	# the files to be installed to /usr, and the Ruby interpreter
 	# on the packaging machine might be in /usr/local.
 	fake_libdir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}"
-	fake_native_support_dir = "#{fakeroot}#{NATIVELY_PACKAGED_NATIVE_SUPPORT_DIR}"
+	fake_native_support_dir = "#{fakeroot}/usr/lib/ruby/#{CONFIG['ruby_version']}/#{CONFIG['arch']}"
 	fake_agents_dir = "#{fakeroot}#{NATIVELY_PACKAGED_AGENTS_DIR}"
 	fake_helper_scripts_dir = "#{fakeroot}#{NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR}"
 	fake_docdir = "#{fakeroot}#{NATIVELY_PACKAGED_DOCDIR}"
@@ -112,12 +112,9 @@ task :fakeroot => [:apache2, :nginx] + Packaging::ASCII_DOCS do
 	sh "cp -R #{LIBDIR}/phusion_passenger #{fake_libdir}/"
 	
 	sh "mkdir -p #{fake_native_support_dir}"
-	Dir["#{NATIVE_SUPPORT_DIR}/*"].each do |subdir|
-		next unless File.directory?(subdir)
-		subdirname = File.basename(subdir)
-		sh "mkdir -p #{fake_native_support_dir}/#{subdirname}"
-		sh "cp -R #{subdir}/*.#{LIBEXT} #{fake_native_support_dir}/#{subdirname}/"
-	end
+	native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+	sh "mkdir -p #{fake_native_support_dir}"
+	sh "cp -R ext/ruby/#{native_support_archdir}/*.#{LIBEXT} #{fake_native_support_dir}/"
 	
 	sh "mkdir -p #{fake_agents_dir}"
 	sh "cp -R #{AGENTS_DIR}/* #{fake_agents_dir}/"

data/build/ruby_extension.rb

@@ -15,16 +15,16 @@
 #  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 native_support_archdir = PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
-output_dir  = "ext/phusion_passenger/#{native_support_archdir}"
-output_name = "native_support.#{LIBEXT}"
-source_dir  = "ext/phusion_passenger"
+output_dir  = "ext/ruby/#{native_support_archdir}"
+output_name = "passenger_native_support.#{LIBEXT}"
+source_dir  = "ext/ruby"
 
 task :native_support => "#{output_dir}/#{output_name}"
 task :clean => 'native_support:clean'
 
 dependencies = [
 	"#{output_dir}/Makefile",
-	"#{source_dir}/native_support.c"
+	"#{source_dir}/passenger_native_support.c"
 ]
 file("#{output_dir}/#{output_name}" => dependencies) do
 	sh "mkdir -p '#{output_dir}'" if !File.exist?(output_dir)
@@ -38,7 +38,7 @@ file "#{output_dir}/Makefile" => "#{source_dir}/extconf.rb" do
 end
 
 task 'native_support:clean' do
-	Dir["ext/phusion_passenger/*"].each do |entry|
+	Dir["ext/ruby/*"].each do |entry|
 		if File.exist?("#{entry}/Makefile")
 			sh "rm -rf #{entry}"
 		end

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.0.pre2"
+#define PASSENGER_VERSION "3.0.0.pre3"
 
 #define FEEDBACK_FD 3
 

data/ext/common/LoggingAgent/RemoteSender.h

@@ -285,6 +285,7 @@ private:
 				someServersAreDown = true;
 			}
 		}
+		P_DEBUG(servers.size() << " Union Station gateway servers are up");
 		
 		if (servers.empty()) {
 			scheduleNextCheckup(5 * 60);
@@ -306,8 +307,9 @@ private:
 	 */
 	void scheduleNextCheckup(unsigned int seconds) {
 		time_t now = SystemTime::get();
-		if (now > nextCheckupTime || (time_t) (now + seconds) < nextCheckupTime) {
+		if (now >= nextCheckupTime || (time_t) (now + seconds) < nextCheckupTime) {
 			nextCheckupTime = now + seconds;
+			P_DEBUG("Next checkup time in about " << seconds << " seconds");
 		}
 	}
 	

data/ext/nginx/ngx_http_passenger_module.c

@@ -464,7 +464,7 @@ init_worker_process(ngx_cycle_t *cycle) {
  */
 static void
 exit_master(ngx_cycle_t *cycle) {
-    shutdown_helper_server(cycle);
+    shutdown_helper_server();
 }
 
 

data/ext/{phusion_passenger → ruby}/extconf.rb

@@ -37,5 +37,5 @@ have_header('alloca.h')
 have_header('ruby/io.h')
 
 with_cflags($CFLAGS) do
-	create_makefile('native_support')
+	create_makefile('passenger_native_support')
 end

data/ext/{phusion_passenger/native_support.c → ruby/passenger_native_support.c}

@@ -994,7 +994,7 @@ fs_watcher_close(VALUE self) {
 /***************************/
 
 void
-Init_native_support() {
+Init_passenger_native_support() {
 	struct sockaddr_un addr;
 	
 	/* */

data/lib/phusion_passenger.rb

@@ -25,7 +25,7 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.0.pre2'
+	VERSION_STRING = '3.0.0.pre3'
 	
 	PREFERRED_NGINX_VERSION = '0.7.67'
 	PREFERRED_PCRE_VERSION  = '8.02'
@@ -47,7 +47,6 @@ module PhusionPassenger
 	end
 	
 	NATIVELY_PACKAGED_SOURCE_ROOT        = "/usr/share/phusion-passenger/source"
-	NATIVELY_PACKAGED_NATIVE_SUPPORT_DIR = "/usr/lib/phusion-passenger/native_support/#{VERSION_STRING}"
 	NATIVELY_PACKAGED_DOCDIR             = "/usr/share/doc/phusion-passenger"
 	NATIVELY_PACKAGED_AGENTS_DIR         = "/usr/lib/phusion-passenger/agents"
 	NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR = "/usr/share/phusion-passenger/helper-scripts"
@@ -77,9 +76,6 @@ module PhusionPassenger
 		# Top directory of the Phusion Passenger source code.
 		SOURCE_ROOT        = File.expand_path(File.join(LIBDIR, ".."))
 		
-		# Directory containing #{archdir}/native_support.so.
-		NATIVE_SUPPORT_DIR = File.join(SOURCE_ROOT, "ext", "phusion_passenger")
-		
 		# Documentation directory.
 		DOCDIR             = File.join(SOURCE_ROOT, "doc")
 		
@@ -91,9 +87,12 @@ module PhusionPassenger
 		
 		# Location of the Apache 2 module.
 		APACHE2_MODULE     = File.join(SOURCE_ROOT, "ext", "apache2", "mod_passenger.so")
+		
+		# Directory possibly containing #{archdir}/passenger_native_support.so.
+		# Not available when natively packaged.
+		NATIVE_SUPPORT_DIR = File.join(SOURCE_ROOT, "ext", "ruby")
 	else
 		SOURCE_ROOT        = NATIVELY_PACKAGED_SOURCE_ROOT
-		NATIVE_SUPPORT_DIR = NATIVELY_PACKAGED_NATIVE_SUPPORT_DIR
 		DOCDIR             = NATIVELY_PACKAGED_DOCDIR
 		AGENTS_DIR         = NATIVELY_PACKAGED_AGENTS_DIR
 		HELPER_SCRIPTS_DIR = NATIVELY_PACKAGED_HELPER_SCRIPTS_DIR

data/lib/phusion_passenger/dependencies.rb

@@ -168,6 +168,29 @@ module Dependencies # :nodoc: all
 		dep.website = "http://www.gnu.org/software/make/"
 	end
 	
+	GnuMake = Dependency.new do |dep|
+		dep.name = "GNU make"
+		dep.define_checker do |result|
+			make = PlatformInfo.gnu_make
+			if make
+				result.found(make)
+			else
+				result.not_found
+			end
+		end
+		if RUBY_PLATFORM =~ /linux/
+			case PlatformInfo.linux_distro
+			when :ubuntu, :debian
+				dep.install_command = "apt-get install build-essential"
+			when :rhel, :fedora, :centos
+				dep.install_command = "yum install make"
+			end
+		elsif RUBY_PLATFORM =~ /darwin/
+			dep.install_instructions = "Please install the Apple Development Tools: http://developer.apple.com/tools/"
+		end
+		dep.website = "http://www.gnu.org/software/make/"
+	end
+	
 	DownloadTool = Dependency.new do |dep|
 		dep.name = "A download tool like 'wget' or 'curl'"
 		dep.define_checker do |result|

data/lib/phusion_passenger/native_support.rb

@@ -22,87 +22,145 @@
 #  THE SOFTWARE.
 
 module PhusionPassenger
-	require 'phusion_passenger'
-	require 'phusion_passenger/platform_info/operating_system'
-	require 'phusion_passenger/platform_info/binary_compatibility'
+
+class NativeSupportLoader
+	def supported?
+		return !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx"
+	end
+	
+	def start
+		require 'phusion_passenger'
+		load_from_source_dir ||
+		load_from_load_path ||
+		load_from_home ||
+		compile_and_load
+	end
+
+private
+	def archdir
+		@archdir ||= begin
+			require 'phusion_passenger/platform_info/binary_compatibility'
+			PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
+		end
+	end
+	
+	def libext
+		@libext ||= begin
+			require 'phusion_passenger/platform_info/operating_system'
+			PlatformInfo.library_extension
+		end
+	end
+	
+	def home
+		@home ||= begin
+			require 'etc' if !defined?(Etc)
+			home = Etc.getpwuid(Process.uid).dir
+		end
+	end
+	
+	def library_name
+		return "passenger_native_support.#{libext}"
+	end
+	
+	def extconf_rb
+		File.join(SOURCE_ROOT, "ext", "ruby", "extconf.rb")
+	end
+	
+	def load_from_source_dir
+		if defined?(NATIVE_SUPPORT_DIR)
+			begin
+				require "#{NATIVE_SUPPORT_DIR}/#{archdir}/#{library_name}"
+				return true
+			rescue LoadError
+				return false
+			end
+		else
+			return false
+		end
+	end
 	
-	libext  = PlatformInfo.library_extension
-	archdir = PlatformInfo.ruby_extension_binary_compatibility_ids.join("-")
-	loaded  = false
-	begin
-		require "#{NATIVE_SUPPORT_DIR}/#{archdir}/native_support.#{libext}"
-		loaded = true
+	def load_from_load_path
+		require 'passenger_native_support'
+		return true
 	rescue LoadError
-		require 'etc'
-		
-		home = Etc.getpwuid(Process.uid).dir
+		return false
+	end
+	
+	def load_from_home
 		begin
-			require "#{home}/#{LOCAL_DIR}/native_support/#{VERSION_STRING}/#{archdir}/native_support.#{libext}"
-			loaded = true
+			require "#{home}/#{LOCAL_DIR}/native_support/#{VERSION_STRING}/#{archdir}/#{library_name}"
+			return true
 		rescue LoadError
+			return false
 		end
 	end
 	
-	if !loaded
-		STDERR.puts "*** Phusion Passenger: no native_support.#{libext} found for " +
+	def compile_and_load
+		STDERR.puts "*** Phusion Passenger: no #{library_name} found for " +
 			"the current Ruby interpreter. Compiling one..."
 		
 		require 'fileutils'
 		require 'phusion_passenger/platform_info/ruby'
 		
-		mkdir = proc do |dir|
-			begin
-				STDERR.puts "# mkdir -p #{dir}"
-				FileUtils.mkdir_p(dir)
-			rescue Errno::EEXIST
-			end
+		target_dirs = []
+		if defined?(NATIVE_SUPPORT_DIR)
+			target_dirs << "#{NATIVE_SUPPORT_DIR}/#{archdir}"
 		end
+		target_dirs << "#{home}/#{LOCAL_DIR}/native_support/#{VERSION_STRING}/#{archdir}"
 		
-		sh = proc do |*args|
-			command_string = args.join(' ')
-			STDERR.puts "# #{command_string}"
-			if !system(*args)
-				raise "Could not compile native_support.#{libext} ('#{command_string}' failed)"
-			end
+		target_dir = compile(target_dirs)
+		require "#{target_dir}/#{library_name}"
+	end
+	
+	def mkdir(dir)
+		begin
+			STDERR.puts "# mkdir -p #{dir}"
+			FileUtils.mkdir_p(dir)
+		rescue Errno::EEXIST
 		end
-		
-		compile = proc do |target_dirs|
-			result = nil
-			target_dirs.each_with_index do |target_dir, i|
-				begin
-					mkdir.call(target_dir)
-					File.open("#{target_dir}/.permission_test", "w").close
-					File.unlink("#{target_dir}/.permission_test")
-					STDERR.puts "# cd #{target_dir}"
-					Dir.chdir(target_dir) do
-						extconf_rb = File.join(SOURCE_ROOT, "ext",
-							"phusion_passenger", "extconf.rb")
-						sh.call(PlatformInfo.ruby_command, extconf_rb)
-						sh.call("make")
-					end
-					result = target_dir
-					break
-				rescue Errno::EACCES
-					# If we encountered a permission error, then try
-					# the next target directory. If we get a permission
-					# error on the last one too then propagate the
-					# exception.
-					if i == target_dirs.size - 1
-						raise
-					else
-						STDERR.puts "Encountered permission error, " +
-							"trying a different directory..."
-						STDERR.puts "-------------------------------"
-					end
+	end
+	
+	def sh(*args)
+		command_string = args.join(' ')
+		STDERR.puts "# #{command_string}"
+		if !system(*args)
+			raise "Could not compile #{library_name} ('#{command_string}' failed)"
+		end
+	end
+	
+	def compile(target_dirs)
+		result = nil
+		target_dirs.each_with_index do |target_dir, i|
+			begin
+				mkdir(target_dir)
+				File.open("#{target_dir}/.permission_test", "w").close
+				File.unlink("#{target_dir}/.permission_test")
+				STDERR.puts "# cd #{target_dir}"
+				Dir.chdir(target_dir) do
+					sh("#{PlatformInfo.ruby_command} '#{extconf_rb}'")
+					sh("make")
+				end
+				result = target_dir
+				break
+			rescue Errno::EACCES
+				# If we encountered a permission error, then try
+				# the next target directory. If we get a permission
+				# error on the last one too then propagate the
+				# exception.
+				if i == target_dirs.size - 1
+					raise
+				else
+					STDERR.puts "Encountered permission error, " +
+						"trying a different directory..."
+					STDERR.puts "-------------------------------"
 				end
 			end
-			result
 		end
-		
-		target_dir = compile.call([
-			"#{NATIVE_SUPPORT_DIR}/#{archdir}",
-			"#{home}/#{LOCAL_DIR}/native_support/#{VERSION_STRING}/#{archdir}"
-		])
-		require "#{target_dir}/native_support.#{libext}"
+		return result
 	end
-end if !defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby" || RUBY_ENGINE == "rbx"
+end
+
+end
+
+loader = PhusionPassenger::NativeSupportLoader.new
+loader.start if loader.supported?

data/lib/phusion_passenger/packaging.rb

@@ -84,7 +84,7 @@ module Packaging
 		'ext/oxt/*.hpp',
 		'ext/oxt/*.cpp',
 		'ext/oxt/detail/*.hpp',
-		'ext/phusion_passenger/*.{c,rb}',
+		'ext/ruby/*.{c,rb}',
 		'misc/*',
 		'test/*.example',
 		'test/support/*.{cpp,h,rb}',

data/lib/phusion_passenger/platform_info/apache.rb

@@ -165,7 +165,7 @@ module PlatformInfo
 		flags = ["-fPIC"]
 		if compiler_supports_visibility_flag?
 			flags << "-fvisibility=hidden -DVISIBILITY_ATTRIBUTE_SUPPORTED"
-			if compiler_visibility_flag_generates_warnings?
+			if compiler_visibility_flag_generates_warnings? && compiler_supports_wno_attributes_flag?
 				flags << "-Wno-attributes"
 			end
 		end

data/lib/phusion_passenger/platform_info/compiler.rb

@@ -34,11 +34,35 @@ module PlatformInfo
 		return ENV['CXX'] || "g++"
 	end
 	
+	def self.gnu_make
+		gmake = find_command('gmake')
+		if !gmake
+			gmake = find_command('make')
+			if gmake
+				if `#{gmake} --version 2>&1` =~ /GNU/
+					return gmake
+				else
+					return nil
+				end
+			else
+				return nil
+			end
+		else
+			return gmake
+		end
+	end
+	memoize :gnu_make, true
+	
 	def self.compiler_supports_visibility_flag?
 		return try_compile(:c, '', '-fvisibility=hidden')
 	end
 	memoize :compiler_supports_visibility_flag?, true
 	
+	def self.compiler_supports_wno_attributes_flag?
+		return try_compile(:c, '', '-Wno-attributes')
+	end
+	memoize :compiler_supports_wno_attributes_flag?, true
+	
 	# Returns whether compiling C++ with -fvisibility=hidden might result
 	# in tons of useless warnings, like this:
 	# http://code.google.com/p/phusion-passenger/issues/detail?id=526
@@ -46,7 +70,7 @@ module PlatformInfo
 	# http://gcc.gnu.org/ml/gcc-patches/2006-07/msg00861.html
 	# Warnings should be suppressed with -Wno-attributes.
 	def self.compiler_visibility_flag_generates_warnings?
-		if `#{cxx} -v 2>&1` =~ /gcc version (.*?)/
+		if RUBY_PLATFORM =~ /linux/ && `#{cxx} -v 2>&1` =~ /gcc version (.*?)/
 			return $1 <= "4.1.2"
 		else
 			return false