passenger 2.0.6 → 2.1.2

data/ext/apache2/System.h

@@ -1,228 +0,0 @@
-/*
- *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (C) 2008  Phusion
- *
- *  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef _PASSENGER_SYSTEM_H_
-#define _PASSENGER_SYSTEM_H_
-
-#include <boost/thread.hpp>
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <signal.h>
-#include <cstdio>
-#include <ctime>
-#include <cassert>
-
-/**
- * Support for interruption of blocking system calls and C library calls.
- *
- * This file provides a framework for writing multithreading code that can
- * be interrupted, even when blocked on system calls or C library calls.
- *
- * One must first call Passenger::setupSysCallInterruptionSupport().
- * Then one may use the functions in Passenger::InterruptableCalls
- * as drop-in replacements for system calls or C library functions.
- * Thread::interrupt() and Thread::interruptAndJoin() should be used
- * for interrupting threads.
- *
- * By default, interruptions are caught.
- */
-
-// This is one of the things that Java is good at and C++ sucks at. Sigh...
-
-namespace Passenger {
-
-	using namespace boost;
-	
-	static const int INTERRUPTION_SIGNAL = SIGINT;
-	
-	/**
-	 * Setup system call interruption support.
-	 * This function may only be called once. It installs a signal handler
-	 * for INTERRUPTION_SIGNAL, so one should not install a different signal
-	 * handler for that signal after calling this function.
-	 */
-	void setupSyscallInterruptionSupport();
-	
-	/**
-	 * Thread class with system call interruption support.
-	 */
-	class Thread: public thread {
-	public:
-		template <class F>
-		explicit Thread(F f, unsigned int stackSize = 0)
-			: thread(f, stackSize) {}
-		
-		/**
-		 * Interrupt the thread. This method behaves just like
-		 * boost::thread::interrupt(), but will also respect the interruption
-		 * points defined in Passenger::InterruptableCalls.
-		 *
-		 * Note that an interruption request may get lost, depending on the
-		 * current execution point of the thread. Thus, one should call this
-		 * method in a loop, until a certain goal condition has been fulfilled.
-		 * interruptAndJoin() is a convenience method that implements this
-		 * pattern.
-		 */
-		void interrupt() {
-			int ret;
-			
-			thread::interrupt();
-			do {
-				ret = pthread_kill(native_handle(),
-					INTERRUPTION_SIGNAL);
-			} while (ret == EINTR);
-		}
-		
-		/**
-		 * Keep interrupting the thread until it's done, then join it.
-		 *
-		 * @throws boost::thread_interrupted
-		 */
-		void interruptAndJoin() {
-			bool done = false;
-			while (!done) {
-				interrupt();
-				done = timed_join(posix_time::millisec(10));
-			}
-		}
-	};
-	
-	/**
-	 * System call and C library call wrappers with interruption support.
-	 * These functions are interruption points, i.e. they throw boost::thread_interrupted
-	 * whenever the calling thread is interrupted by Thread::interrupt() or
-	 * Thread::interruptAndJoin().
-	 */
-	namespace InterruptableCalls {
-		ssize_t read(int fd, void *buf, size_t count);
-		ssize_t write(int fd, const void *buf, size_t count);
-		int close(int fd);
-		
-		int socketpair(int d, int type, int protocol, int sv[2]);
-		ssize_t recvmsg(int s, struct msghdr *msg, int flags);
-		ssize_t sendmsg(int s, const struct msghdr *msg, int flags);
-		int shutdown(int s, int how);
-		
-		FILE *fopen(const char *path, const char *mode);
-		int fclose(FILE *fp);
-		
-		time_t time(time_t *t);
-		int usleep(useconds_t usec);
-		int nanosleep(const struct timespec *req, struct timespec *rem);
-		
-		pid_t fork();
-		int kill(pid_t pid, int sig);
-		pid_t waitpid(pid_t pid, int *status, int options);
-	}
-
-} // namespace Passenger
-
-namespace boost {
-namespace this_thread {
-
-	/**
-	 * @intern
-	 */
-	extern thread_specific_ptr<bool> _syscalls_interruptable;
-	
-	/**
-	 * Check whether system calls should be interruptable in
-	 * the calling thread.
-	 */
-	bool syscalls_interruptable();
-	
-	class restore_syscall_interruption;
-
-	/**
-	 * Create this struct on the stack to temporarily enable system
-	 * call interruption, until the object goes out of scope.
-	 */
-	class enable_syscall_interruption {
-	private:
-		bool lastValue;
-	public:
-		enable_syscall_interruption() {
-			if (_syscalls_interruptable.get() == NULL) {
-				lastValue = true;
-				_syscalls_interruptable.reset(new bool(true));
-			} else {
-				lastValue = *_syscalls_interruptable;
-				*_syscalls_interruptable = true;
-			}
-		}
-		
-		~enable_syscall_interruption() {
-			*_syscalls_interruptable = lastValue;
-		}
-	};
-	
-	/**
-	 * Create this struct on the stack to temporarily disable system
-	 * call interruption, until the object goes out of scope.
-	 * While system call interruption is disabled, the functions in
-	 * InterruptableCalls will try until the return code is not EINTR.
-	 */
-	class disable_syscall_interruption {
-	private:
-		friend class restore_syscall_interruption;
-		bool lastValue;
-	public:
-		disable_syscall_interruption() {
-			if (_syscalls_interruptable.get() == NULL) {
-				lastValue = true;
-				_syscalls_interruptable.reset(new bool(false));
-			} else {
-				lastValue = *_syscalls_interruptable;
-				*_syscalls_interruptable = false;
-			}
-		}
-		
-		~disable_syscall_interruption() {
-			*_syscalls_interruptable = lastValue;
-		}
-	};
-	
-	/**
-	 * Creating an object of this class on the stack will restore the
-	 * system call interruption state to what it was before.
-	 */
-	class restore_syscall_interruption {
-	private:
-		int lastValue;
-	public:
-		restore_syscall_interruption(const disable_syscall_interruption &intr) {
-			assert(_syscalls_interruptable.get() != NULL);
-			lastValue = *_syscalls_interruptable;
-			*_syscalls_interruptable = intr.lastValue;
-		}
-		
-		~restore_syscall_interruption() {
-			*_syscalls_interruptable = lastValue;
-		}
-	};
-
-} // namespace this_thread
-} // namespace boost
-
-#endif /* _PASSENGER_SYSTEM_H_ */
-

data/lib/passenger/platform_info.rb

@@ -1,302 +0,0 @@
-#  Phusion Passenger - http://www.modrails.com/
-#  Copyright (C) 2008  Phusion
-#
-#  Phusion Passenger is a trademark of Hongli Lai & Ninh Bui.
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along
-#  with this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-require 'rbconfig'
-
-# Wow, I can't believe in how many ways one can build Apache in OS
-# X! We have to resort to all sorts of tricks to make Passenger build
-# out of the box on OS X. :-(
-#
-# In the name of usability and the "end user is the king" line of thought,
-# I shall suffer the horrible faith of writing tons of autodetection code!
-
-# This module autodetects various platform-specific information, and
-# provides that information through constants.
-#
-# Users can change the detection behavior by setting the environment variable
-# <tt>APXS2</tt> to the correct 'apxs' (or 'apxs2') binary, as provided by
-# Apache.
-module PlatformInfo
-private
-	def self.env_defined?(name)
-		return !ENV[name].nil? && !ENV[name].empty?
-	end
-	
-	def self.determine_gem_command
-		gem_exe_in_path = find_command("gem")
-		correct_gem_exe = File.dirname(RUBY) + "/gem"
-		if gem_exe_in_path.nil? || gem_exe_in_path == correct_gem_exe
-			return "gem"
-		else
-			return correct_gem_exe
-		end
-	end
-
-	def self.find_apxs2
-		if env_defined?("APXS2")
-			return ENV["APXS2"]
-		end
-		['apxs2', 'apxs'].each do |name|
-			command = find_command(name)
-			if !command.nil?
-				return command
-			end
-		end
-		return nil
-	end
-	
-	def self.determine_apache2_bindir
-		if APXS2.nil?
-			return nil
-		else
-			return `#{APXS2} -q BINDIR 2>/dev/null`.strip
-		end
-	end
-	
-	def self.determine_apache2_sbindir
-		if APXS2.nil?
-			return nil
-		else
-			return `#{APXS2} -q SBINDIR`.strip
-		end
-	end
-	
-	def self.find_apache2_executable(*possible_names)
-		[APACHE2_BINDIR, APACHE2_SBINDIR].each do |bindir|
-			if bindir.nil?
-				next
-			end
-			possible_names.each do |name|
-				filename = "#{bindir}/#{name}"
-				if File.file?(filename) && File.executable?(filename)
-					return filename
-				end
-			end
-		end
-		return nil
-	end
-	
-	def self.find_apache2ctl
-		return find_apache2_executable('apache2ctl', 'apachectl')
-	end
-	
-	def self.find_httpd
-		if env_defined?('HTTPD')
-			return ENV['HTTPD']
-		elsif APXS2.nil?
-			["apache2", "httpd2", "apache", "httpd"].each do |name|
-				command = find_command(name)
-				if !command.nil?
-					return command
-				end
-			end
-			return nil
-		else
-			return find_apache2_executable(`#{APXS2} -q TARGET`.strip)
-		end
-	end
-	
-	def self.determine_apxs2_flags
-		if APXS2.nil?
-			return nil
-		else
-			flags = `#{APXS2} -q CFLAGS`.strip << " -I" << `#{APXS2} -q INCLUDEDIR`
-			flags.strip!
-			flags.gsub!(/-O\d? /, '')
-			return flags
-		end
-	end
-	
-	def self.find_apr_config
-		if env_defined?('APR_CONFIG')
-			apr_config = ENV['APR_CONFIG']
-		elsif RUBY_PLATFORM =~ /darwin/ && HTTPD == "/usr/sbin/httpd"
-			# If we're on MacOS X, and we're compiling against the
-			# default provided Apache, then we'll want to query the
-			# correct 'apr-1-config' command. However, that command
-			# is not in $PATH by default. Instead, it lives in
-			# /Developer/SDKs/MacOSX*sdk/usr/bin.
-			sdk_dir = Dir["/Developer/SDKs/MacOSX*sdk"].sort.last
-			if sdk_dir
-				apr_config = "#{sdk_dir}/usr/bin/apr-1-config"
-				if !File.executable?(apr_config)
-					apr_config = nil
-				end
-			end
-		else
-			apr_config = find_command('apr-1-config')
-			if apr_config.nil?
-				apr_config = find_command('apr-config')
-			end
-		end
-		return apr_config
-	end
-	
-	def self.determine_apr_info
-		if APR_CONFIG.nil?
-			return nil
-		else
-			flags = `#{APR_CONFIG} --cppflags --includes`.strip
-			libs = `#{APR_CONFIG} --link-ld`.strip
-			flags.gsub!(/-O\d? /, '')
-			return [flags, libs]
-		end
-	end
-
-	def self.find_apu_config
-		if env_defined?('APU_CONFIG')
-			apu_config = ENV['APU_CONFIG']
-		elsif RUBY_PLATFORM =~ /darwin/ && HTTPD == "/usr/sbin/httpd"
-			# If we're on MacOS X, and we're compiling against the
-			# default provided Apache, then we'll want to query the
-			# correct 'apu-1-config' command. However, that command
-			# is not in $PATH by default. Instead, it lives in
-			# /Developer/SDKs/MacOSX*sdk/usr/bin.
-			sdk_dir = Dir["/Developer/SDKs/MacOSX*sdk"].sort.last
-			if sdk_dir
-				apu_config = "#{sdk_dir}/usr/bin/apu-1-config"
-				if !File.executable?(apu_config)
-					apu_config = nil
-				end
-			end
-		else
-			apu_config = find_command('apu-1-config')
-			if apu_config.nil?
-				apu_config = find_command('apu-config')
-			end
-		end
-		return apu_config
-	end
-	
-	def self.determine_apu_info
-		if APU_CONFIG.nil?
-			return nil
-		else
-			flags = `#{APU_CONFIG} --includes`.strip
-			libs = `#{APU_CONFIG} --link-ld`.strip
-			flags.gsub!(/-O\d? /, '')
-			return [flags, libs]
-		end
-	end
-	
-	def self.determine_multi_arch_flags
-		if RUBY_PLATFORM =~ /darwin/ && !HTTPD.nil?
-			architectures = []
-			`file "#{HTTPD}"`.split("\n").grep(/for architecture/).each do |line|
-				line =~ /for architecture (.*?)\)/
-				architectures << "-arch #{$1}"
-			end
-			return architectures.join(' ')
-		else
-			return ""
-		end
-	end
-	
-	def self.determine_library_extension
-		if RUBY_PLATFORM =~ /darwin/
-			return "bundle"
-		else
-			return "so"
-		end
-	end
-	
-	def self.read_file(filename)
-		return File.read(filename)
-	rescue
-		return ""
-	end
-	
-	def self.determine_linux_distro
-		if RUBY_PLATFORM !~ /linux/
-			return nil
-		end
-		lsb_release = read_file("/etc/lsb-release")
-		if lsb_release =~ /Ubuntu/
-			return :ubuntu
-		elsif File.exist?("/etc/debian_version")
-			return :debian
-		elsif File.exist?("/etc/redhat-release")
-			redhat_release = read_file("/etc/redhat-release")
-			if redhat_release =~ /CentOS/
-				return :centos
-			elsif redhat_release =~ /Fedora/  # is this correct?
-				return :fedora
-			else
-				# On official RHEL distros, the content is in the form of
-				# "Red Hat Enterprise Linux Server release 5.1 (Tikanga)"
-				return :rhel
-			end
-		elsif File.exist?("/etc/suse-release")
-			return :suse
-		elsif File.exist?("/etc/gentoo-release")
-			return :gentoo
-		else
-			return :unknown
-		end
-		# TODO: Slackware, Mandrake/Mandriva
-	end
-
-public
-	# Check whether the specified command is in $PATH, and return its
-	# absolute filename. Returns nil if the command is not found.
-	#
-	# This function exists because system('which') doesn't always behave
-	# correctly, for some weird reason.
-	def self.find_command(name)
-		ENV['PATH'].split(File::PATH_SEPARATOR).detect do |directory|
-			path = File.join(directory, name.to_s)
-			if File.executable?(path)
-				return path
-			end
-		end
-		return nil
-	end
-
-	# The absolute path to the current Ruby interpreter.
-	RUBY = Config::CONFIG['bindir'] + '/' + Config::CONFIG['RUBY_INSTALL_NAME'] + Config::CONFIG['EXEEXT']
-	# The correct 'gem' command for this Ruby interpreter.
-	GEM = determine_gem_command
-	
-	# The absolute path to the 'apxs' or 'apxs2' executable.
-	APXS2 = find_apxs2
-	# The absolute path to the Apache 2 'bin' directory.
-	APACHE2_BINDIR = determine_apache2_bindir
-	# The absolute path to the Apache 2 'sbin' directory.
-	APACHE2_SBINDIR = determine_apache2_sbindir
-	# The absolute path to the 'apachectl' or 'apache2ctl' binary.
-	APACHE2CTL = find_apache2ctl
-	# The absolute path to the Apache binary (that is, 'httpd', 'httpd2', 'apache' or 'apache2').
-	HTTPD = find_httpd
-	# The absolute path to the 'apr-config' or 'apr-1-config' executable.
-	APR_CONFIG = find_apr_config
-	APU_CONFIG = find_apu_config
-	
-	# The C compiler flags that are necessary to compile an Apache module.
-	APXS2_FLAGS = determine_apxs2_flags
-	# The C compiler flags that are necessary for programs that use APR.
-	APR_FLAGS, APR_LIBS = determine_apr_info
-	# The C compiler flags that are necessary for programs that use APR-Util.
-	APU_FLAGS, APU_LIBS = determine_apu_info
-
-	# The C compiler flags that are necessary for building binaries in the same architecture(s) as Apache.
-	MULTI_ARCH_FLAGS = determine_multi_arch_flags
-	# The current platform's shared library extension ('so' on most Unices).
-	LIBEXT = determine_library_extension
-	# An identifier for the current Linux distribution. nil if the operating system is not Linux.
-	LINUX_DISTRO = determine_linux_distro
-end