passenger 4.0.60 → 5.0.0.beta1

data/ext/oxt/thread.hpp

@@ -148,6 +148,11 @@ public:
 	 */
 	static std::string all_backtraces() throw();
 
+	/**
+	 * Return the current thread's backtrace, in a nicely formatted string.
+	 */
+	static std::string current_backtrace() throw();
+
 	/**
 	 * Interrupt the thread. This method behaves just like
 	 * boost::thread::interrupt(), but if <em>interruptSyscalls</em> is true

data/ext/ruby/extconf.rb

@@ -21,9 +21,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 require 'mkmf'
-
-$LIBS << " -lpthread" if $LIBS !~ /-lpthread/
+$LIBS = ""
 $CFLAGS << " -g"
+$LIBS << " -lpthread"
 
 if RUBY_PLATFORM =~ /solaris/
 	have_library('xnet')
@@ -37,10 +37,8 @@ end
 have_header('alloca.h')
 have_header('ruby/version.h')
 have_header('ruby/io.h')
-have_header('ruby/thread.h')
 have_var('ruby_version')
-have_func('rb_thread_io_blocking_region', 'ruby/io.h')
-have_func('rb_thread_call_without_gvl', 'ruby/thread.h')
+have_func('rb_thread_io_blocking_region')
 
 with_cflags($CFLAGS) do
 	create_makefile('passenger_native_support')
@@ -64,4 +62,3 @@ with_cflags($CFLAGS) do
 		end
 	end
 end
-

data/ext/ruby/passenger_native_support.c

@@ -36,9 +36,6 @@
 #ifdef HAVE_RUBY_VERSION_H
 	#include "ruby/version.h"
 #endif
-#ifdef HAVE_RUBY_THREAD_H
-	#include "ruby/thread.h"
-#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -202,19 +199,11 @@ update_group_written_info(IOVectorGroup *group, ssize_t bytes_written) {
 		int iovcnt;
 	} WritevWrapperData;
 
-	#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-		static void *
-		writev_wrapper(void *ptr) {
-			WritevWrapperData *data = (WritevWrapperData *) ptr;
-			return (void *) writev(data->filedes, data->iov, data->iovcnt);
-		}
-	#else
-		static VALUE
-		writev_wrapper(void *ptr) {
-			WritevWrapperData *data = (WritevWrapperData *) ptr;
-			return (VALUE) writev(data->filedes, data->iov, data->iovcnt);
-		}
-	#endif
+	static VALUE
+	writev_wrapper(void *ptr) {
+		WritevWrapperData *data = (WritevWrapperData *) ptr;
+		return (VALUE) writev(data->filedes, data->iov, data->iovcnt);
+	}
 #endif
 
 static VALUE
@@ -331,10 +320,7 @@ f_generic_writev(VALUE fd, VALUE *array_of_components, unsigned int count) {
 				writev_wrapper_data.filedes = fd_num;
 				writev_wrapper_data.iov     = groups[i].io_vectors;
 				writev_wrapper_data.iovcnt  = groups[i].count;
-				#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-					ret = (int) rb_thread_call_without_gvl(writev_wrapper,
-						&writev_wrapper_data, RUBY_UBF_IO, NULL);
-				#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
+				#ifdef HAVE_RB_THREAD_IO_BLOCKING_REGION
 					ret = (int) rb_thread_io_blocking_region(writev_wrapper,
 						&writev_wrapper_data, fd_num);
 				#else
@@ -740,23 +726,13 @@ fs_watcher_wait_fd(VALUE _fd) {
 }
 
 #ifndef TRAP_BEG
-	#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-		static void *
-		fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
-			FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
-			data->ret = read(data->fd, &data->byte, 1);
-			data->error = errno;
-			return NULL;
-		}
-	#else
-		static VALUE
-		fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
-			FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
-			data->ret = read(data->fd, &data->byte, 1);
-			data->error = errno;
-			return Qnil;
-		}
-	#endif
+	static VALUE
+	fs_watcher_read_byte_from_fd_wrapper(void *_arg) {
+		FSWatcherReadByteData *data = (FSWatcherReadByteData *) _arg;
+		data->ret = read(data->fd, &data->byte, 1);
+		data->error = errno;
+		return Qnil;
+	}
 #endif
 
 static VALUE
@@ -767,9 +743,6 @@ fs_watcher_read_byte_from_fd(VALUE _arg) {
 		data->ret = read(data->fd, &data->byte, 1);
 		TRAP_END;
 		data->error = errno;
-	#elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-		rb_thread_call_without_gvl2(fs_watcher_read_byte_from_fd_wrapper,
-			data, RUBY_UBF_IO, NULL);
 	#elif defined(HAVE_RB_THREAD_IO_BLOCKING_REGION)
 		rb_thread_io_blocking_region(fs_watcher_read_byte_from_fd_wrapper,
 			data, data->fd);

data/helper-scripts/download_binaries/extconf.rb

@@ -43,7 +43,7 @@ require 'phusion_passenger'
 PhusionPassenger.locate_directories
 require 'fileutils'
 
-if PhusionPassenger.natively_packaged?
+if PhusionPassenger.custom_packaged?
 	puts "Binary downloading is only available when originally packaged. Stopping."
 	exit 0
 end
@@ -95,7 +95,7 @@ def really_download(site, name, logger, options)
 	url = "#{site[:url]}/#{PhusionPassenger::VERSION_STRING}/#{name}"
 	puts "Attempting to download #{url} into #{Dir.pwd}"
 	File.unlink("#{name}.tmp") rescue nil
-	
+
 	options = {
 		:cacert => site[:cert],
 		:logger => logger
@@ -110,5 +110,5 @@ def really_download(site, name, logger, options)
 end
 
 download "rubyext-#{ruby_compat_id}.tar.gz", :total_timeout => 10
-download "webhelper-#{PhusionPassenger::PREFERRED_NGINX_VERSION}-#{cxx_compat_id}.tar.gz", :total_timeout => 120
-download "support-#{cxx_compat_id}.tar.gz", :total_timeout => 900
+download "nginx-#{PhusionPassenger::PREFERRED_NGINX_VERSION}-#{cxx_compat_id}.tar.gz", :total_timeout => 120
+download "agent-#{cxx_compat_id}.tar.gz", :total_timeout => 900

data/helper-scripts/meteor-loader.rb

@@ -32,7 +32,7 @@ module App
 	def self.options
 		return @@options
 	end
-	
+
 	def self.exit_code_for_exception(e)
 		if e.is_a?(SystemExit)
 			return e.status
@@ -40,13 +40,13 @@ module App
 			return 1
 		end
 	end
-	
+
 	def self.handshake_and_read_startup_request
 		STDOUT.sync = true
 		STDERR.sync = true
 		puts "!> I have control 1.0"
 		abort "Invalid initialization header" if STDIN.readline != "You have control 1.0\n"
-		
+
 		@@options = {}
 		while (line = STDIN.readline) != "\n"
 			name, value = line.strip.split(/: */, 2)
@@ -85,15 +85,8 @@ module App
 			socket.close if socket
 		end
 	end
-	
-	def self.create_control_server
-		dir = Utils.mktmpdir('meteor')
-		filename = "#{dir}/control"
-		server = UNIXServer.new(filename)
-		return [server, dir, filename]
-	end
 
-	def self.load_app(control_server)
+	def self.load_app
 		port = nil
 		tries = 0
 		while port.nil? && tries < 200
@@ -117,7 +110,6 @@ module App
 			# Meteor its own process group, and sending signals to the
 			# entire process group.
 			Process.setpgrp
-			control_server.close
 			exec("meteor run -p #{port} #{production}")
 		end
 		$0 = options["process_title"] if options["process_title"]
@@ -125,127 +117,35 @@ module App
 		return [pid, port]
 	end
 
-	class ExitFlag
-		def initialize
-			@mutex = Mutex.new
-			@cond  = ConditionVariable.new
-			@exit  = false
-		end
-
-		def set
-			@mutex.synchronize do
-				@exit = true
-				@cond.broadcast
-			end
-		end
-
-		def wait
-			@mutex.synchronize do
-				while !@exit
-					@cond.wait(@mutex)
-				end
-			end
-		end
-	end
-
-	# When the HelperAgent is shutting down, it first sends a message (A) to application
-	# processes through the control socket that this is happening. The HelperAgent then
-	# waits until all HTTP connections are closed, before sending another message
-	# to application processes that they should shut down (B).
-	# Because Meteor opens long-running connections (e.g. for WebSocket), we have to shut
-	# down the Meteor app when A arrives, otherwise the HelperAgent will never send B.
-	def self.wait_for_exit_message(control_server)
-		exit_flag = ExitFlag.new
-		start_control_server_thread(control_server, exit_flag)
-		start_stdin_waiter_thread(exit_flag)
-		exit_flag.wait
-	end
-
-	def self.start_control_server_thread(control_server, exit_flag)
-		Thread.new do
-			Thread.current.abort_on_exception = true
-			while true
-				process_next_control_client(control_server, exit_flag)
-			end
-		end
-	end
-
-	def self.process_next_control_client(control_server, exit_flag)
-		logger = Logger.new(STDERR)
+	def self.wait_for_exit_message
 		begin
-			client = control_server.accept
-			channel = MessageChannel.new(client)
-			while message = channel.read
-				process_next_control_message(message, logger, exit_flag)
-			end
-		rescue Exception => e
-			logger.error("#{e} (#{e.class})\n  " + e.backtrace.join("\n  "))
-		ensure
-			begin
-				client.close if client
-			rescue SystemCallError, IOError, SocketError
-			end
-		end
-	end
-
-	def self.process_next_control_message(message, logger, exit_flag)
-		if message[0] == "abort_long_running_connections"
-			logger.debug("Aborting long-running connections")
-			exit_flag.set
-		else
-			logger.error("Invalid control message: #{message.inspect}")
+			STDIN.readline
+		rescue EOFError
 		end
 	end
 
-	def self.start_stdin_waiter_thread(exit_flag)
-		Thread.new do
-			Thread.current.abort_on_exception = true
-			begin
-				STDIN.readline
-			rescue EOFError
-			ensure
-				exit_flag.set
-			end
-		end
-	end
 
-	
-	
 	################## Main code ##################
-	
-	
+
+
 	handshake_and_read_startup_request
 	init_passenger
 	begin
-		control_server, control_dir, control_filename = create_control_server
-		pid, port = load_app(control_server)
+		pid, port = load_app
 		while !ping_port(port)
 			sleep 0.01
 		end
 		puts "!> Ready"
 		puts "!> socket: main;tcp://127.0.0.1:#{port};http_session;0"
-		puts "!> socket: control;unix:#{control_filename};control;0"
 		puts "!> "
-		wait_for_exit_message(control_server)
+		wait_for_exit_message
 	ensure
 		if pid
 			Process.kill('INT', -pid) rescue nil
 			Process.waitpid(pid) rescue nil
 			Process.kill('INT', -pid) rescue nil
 		end
-		if control_server
-			control_server.close
-			begin
-				File.unlink(control_filename)
-			rescue SystemCallError
-			end
-			require 'fileutils'
-			begin
-				FileUtils.remove_entry_secure(control_dir)
-			rescue SystemCallError
-			end
-		end
 	end
-	
+
 end # module App
 end # module PhusionPassenger

data/helper-scripts/node-loader.js

@@ -29,7 +29,6 @@ var os = require('os');
 var fs = require('fs');
 var net = require('net');
 var http = require('http');
-var util = require('util');
 
 var LineReader = require('phusion_passenger/line_reader').LineReader;
 
@@ -131,8 +130,8 @@ function generateServerSocketPath() {
 	var options = PhusionPassenger.options;
 	var socketDir, socketPrefix, socketSuffix;
 
-	if (options.generation_dir) {
-		socketDir = options.generation_dir + "/backends";
+	if (options.socket_dir) {
+		socketDir = options.socket_dir;
 		socketPrefix = "node";
 	} else {
 		socketDir = os.tmpdir().replace(/\/$/, '');
@@ -198,7 +197,7 @@ function installServer() {
 			server.originalListen(socketPath, function() {
 				server.removeListener('error', errorHandler);
 				doneListening(callback);
-				process.nextTick(installControlServer);
+				process.nextTick(finalizeStartup);
 			});
 		}
 
@@ -233,93 +232,11 @@ function listenAndMaybeInstall(port) {
 	}
 }
 
-function installControlServer() {
-	var server = net.createServer(onNewClient);
-	var listenTries = 0;
-
-	doListen();
-
-	function onNewClient(client) {
-		client.on('error', function(e) {
-			console.trace(e);
-		});
-		readNextMessageHeader(client);
-	}
-
-	function readNextMessageHeader(client) {
-		client.once('readable', onReadable);
-
-		function onReadable() {
-			var size = client.read(2);
-			if (size !== null) {
-				readNextMessageBody(client, size.readUInt16BE(0));
-			} else {
-				client.once('readable', onReadable);
-			}
-		}
-	}
-
-	function readNextMessageBody(client, size) {
-		client.once('readable', onReadable);
-
-		function onReadable() {
-			var body = client.read(size);
-			if (body !== null) {
-				var args = body.toString('binary').split("\0");
-				args.pop();
-				handleMessage(client, args);
-			} else {
-				client.once('readable', onReadable);
-			}
-		}
-	}
-
-	function handleMessage(client, args) {
-		if (args[0] == 'abort_long_running_connections') {
-			shutdown();
-			client.end();
-		} else {
-			console.error("Invalid control message: " + util.inspect(args));
-			readNextMessageHeader(client);
-		}
-	}
-
-	function doListen() {
-		function errorHandler(error) {
-			if (error.errno == 'EADDRINUSE') {
-				if (listenTries == 100) {
-					server.emit('error', new Error(
-						'Phusion Passenger could not find suitable socket address to bind the control server on'));
-				} else {
-					// Try again with another socket path.
-					listenTries++;
-					doListen();
-				}
-			} else {
-				server.emit('error', error);
-			}
-		}
-
-		var socketPath = PhusionPassenger.options.control_socket_path =
-			generateServerSocketPath();
-		server.once('error', errorHandler);
-		server.listen(socketPath, function() {
-			server.removeListener('error', errorHandler);
-			process.nextTick(finalizeStartup);
-		});
-	}
-}
-
 function finalizeStartup() {
 	process.stdout.write("!> Ready\n");
 	process.stdout.write("!> socket: main;unix:" +
 		PhusionPassenger._server.address() +
 		";http_session;0\n");
-	if (process.env['_PASSENGER_NODE_CONTROL_SERVER']) {
-		process.stdout.write("!> socket: control;unix:" +
-			PhusionPassenger.options.control_socket_path +
-			";control;0\n");
-	}
 	process.stdout.write("!> \n");
 }
 
@@ -334,11 +251,6 @@ function shutdown() {
 	} catch (e) {
 		// Ignore error.
 	}
-	try {
-		fs.unlinkSync(PhusionPassenger.options.control_socket_path);
-	} catch (e) {
-		// Ignore error.
-	}
 	if (PhusionPassenger.listeners('exit').length == 0) {
 		process.exit(0);
 	} else {