passenger 3.0.9 → 3.0.10

data/ext/common/AgentsStarter.hpp

@@ -36,19 +36,19 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "Constants.h"
-#include "FileDescriptor.h"
-#include "MessageChannel.h"
-#include "MessageClient.h"
-#include "ServerInstanceDir.h"
-#include "Exceptions.h"
-#include "ResourceLocator.h"
-#include "Utils.h"
-#include "Utils/IOUtils.h"
-#include "Utils/Base64.h"
-#include "Utils/Timer.h"
-#include "Utils/ScopeGuard.h"
-#include "Utils/VariantMap.h"
+#include <Constants.h>
+#include <FileDescriptor.h>
+#include <MessageClient.h>
+#include <ServerInstanceDir.h>
+#include <Exceptions.h>
+#include <ResourceLocator.h>
+#include <Utils.h>
+#include <Utils/IOUtils.h>
+#include <Utils/MessageIO.h>
+#include <Utils/Base64.h>
+#include <Utils/Timer.h>
+#include <Utils/ScopeGuard.h>
+#include <Utils/VariantMap.h>
 
 namespace Passenger {
 
@@ -125,8 +125,8 @@ private:
 		if (fd != FEEDBACK_FD && syscalls::dup2(fd, FEEDBACK_FD) == -1) {
 			int e = errno;
 			try {
-				MessageChannel channel(fd);
-				channel.write("system error",
+				writeArrayMessage(fd,
+					"system error",
 					"dup2() failed",
 					toString(e).c_str(),
 					NULL);
@@ -466,8 +466,10 @@ public:
 			execl(watchdogFilename.c_str(), "PassengerWatchdog", (char *) 0);
 			e = errno;
 			try {
-				MessageChannel channel(FEEDBACK_FD);
-				channel.write("exec error", toString(e).c_str(), NULL);
+				writeArrayMessage(FEEDBACK_FD,
+					"exec error",
+					toString(e).c_str(),
+					NULL);
 				_exit(1);
 			} catch (...) {
 				fprintf(stderr, "Passenger AgentsStarter: could not execute %s: %s (%d)\n",
@@ -483,7 +485,6 @@ public:
 			// Parent
 			UPDATE_TRACE_POINT();
 			FileDescriptor feedbackFd = fds[0];
-			MessageChannel feedbackChannel(fds[0]);
 			vector<string> args;
 			bool result, allAgentsStarted;
 			
@@ -501,7 +502,7 @@ public:
 			 * reading the arguments. We'll notice that later.
 			 */
 			try {
-				watchdogArgs.writeToChannel(feedbackChannel);
+				watchdogArgs.writeToFd(feedbackFd);
 			} catch (const SystemException &e) {
 				if (e.code() != EPIPE && e.code() != ECONNRESET) {
 					inspectWatchdogCrashReason(pid);
@@ -516,7 +517,7 @@ public:
 			UPDATE_TRACE_POINT();
 			
 			try {
-				result = feedbackChannel.read(args);
+				result = readArrayMessage(feedbackFd, args);
 			} catch (const SystemException &ex) {
 				if (ex.code() == ECONNRESET) {
 					inspectWatchdogCrashReason(pid);
@@ -585,7 +586,7 @@ public:
 			while (!allAgentsStarted) {
 				try {
 					UPDATE_TRACE_POINT();
-					result = feedbackChannel.read(args);
+					result = readArrayMessage(feedbackFd, args);
 				} catch (const SystemException &ex) {
 					killProcessGroupAndWait(&pid, 5000);
 					guard.clear();

data/ext/common/ApplicationPool/Client.h

@@ -186,14 +186,6 @@ protected:
 			return fd;
 		}
 		
-		virtual void setReaderTimeout(unsigned int msec) {
-			MessageChannel(fd).setReadTimeout(msec);
-		}
-		
-		virtual void setWriterTimeout(unsigned int msec) {
-			MessageChannel(fd).setWriteTimeout(msec);
-		}
-		
 		virtual void shutdownReader() {
 			if (fd != -1) {
 				int ret = syscalls::shutdown(fd, SHUT_RD);

data/ext/common/ApplicationPool/Server.h

@@ -44,6 +44,7 @@
 #include "../FileDescriptor.h"
 #include "../Exceptions.h"
 #include "../Utils.h"
+#include "../Utils/MessageIO.h"
 
 namespace Passenger {
 namespace ApplicationPool {
@@ -164,13 +165,12 @@ private:
 	 */
 	class EnvironmentVariablesFetcher: public StringListCreator {
 	private:
-		MessageChannel &channel;
+		int fd;
 		PoolOptions &options;
 		mutable StringListPtr result;
 	public:
-		EnvironmentVariablesFetcher(MessageChannel &theChannel, PoolOptions &theOptions)
-			: channel(theChannel),
-			  options(theOptions)
+		EnvironmentVariablesFetcher(int theFd, PoolOptions &theOptions)
+			: fd(theFd), options(theOptions)
 		{ }
 		
 		/**
@@ -189,14 +189,14 @@ private:
 			 * where the connection with the client will be broken.
 			 */
 			try {
-				channel.write("getEnvironmentVariables", NULL);
+				writeArrayMessage(fd, "getEnvironmentVariables", NULL);
 			} catch (const SystemException &e) {
 				throw ClientCommunicationError(
 					"Unable to send a 'getEnvironmentVariables' request to the client",
 					e.code());
 			}
 			try {
-				if (!channel.readScalar(data)) {
+				if (!readScalarMessage(fd, data)) {
 					throw ClientCommunicationError("Unable to read a reply from the client for the 'getEnvironmentVariables' request.");
 				}
 			} catch (const SystemException &e) {
@@ -278,7 +278,7 @@ private:
 		try {
 			PoolOptions options(args, 1, analyticsLogger);
 			options.environmentVariables = ptr(new EnvironmentVariablesFetcher(
-				commonContext.channel, options));
+				commonContext.fd, options));
 			options.initiateSession = false;
 			session = pool->get(options);
 			specificContext->sessions[specificContext->lastSessionID] = session;
@@ -290,23 +290,23 @@ private:
 			if (e.hasErrorPage()) {
 				P_TRACE(3, "Client " << commonContext.name() << ": SpawnException "
 					"occured (with error page)");
-				commonContext.channel.write("SpawnException", e.what(), "true", NULL);
-				commonContext.channel.writeScalar(e.getErrorPage());
+				writeArrayMessage(commonContext.fd, "SpawnException", e.what(), "true", NULL);
+				writeScalarMessage(commonContext.fd, e.getErrorPage());
 			} else {
 				P_TRACE(3, "Client " << commonContext.name() << ": SpawnException "
 					"occured (no error page)");
-				commonContext.channel.write("SpawnException", e.what(), "false", NULL);
+				writeArrayMessage(commonContext.fd, "SpawnException", e.what(), "false", NULL);
 			}
 			failed = true;
 		} catch (const BusyException &e) {
 			UPDATE_TRACE_POINT();
 			this_thread::disable_syscall_interruption dsi;
-			commonContext.channel.write("BusyException", e.what(), NULL);
+			writeArrayMessage(commonContext.fd, "BusyException", e.what(), NULL);
 			failed = true;
 		} catch (const IOException &e) {
 			UPDATE_TRACE_POINT();
 			this_thread::disable_syscall_interruption dsi;
-			commonContext.channel.write("IOException", e.what(), NULL);
+			writeArrayMessage(commonContext.fd, "IOException", e.what(), NULL);
 			failed = true;
 		}
 		UPDATE_TRACE_POINT();
@@ -314,7 +314,8 @@ private:
 			this_thread::disable_syscall_interruption dsi;
 			try {
 				UPDATE_TRACE_POINT();
-				commonContext.channel.write("ok",
+				writeArrayMessage(commonContext.fd,
+					"ok",
 					toString(session->getPid()).c_str(),
 					session->getSocketType().c_str(),
 					session->getSocketName().c_str(),
@@ -344,9 +345,9 @@ private:
 		TRACE_POINT();
 		commonContext.requireRights(Account::DETACH);
 		if (pool->detach(args[1])) {
-			commonContext.channel.write("true", NULL);
+			writeArrayMessage(commonContext.fd, "true", NULL);
 		} else {
-			commonContext.channel.write("false", NULL);
+			writeArrayMessage(commonContext.fd, "false", NULL);
 		}
 	}
 	
@@ -371,19 +372,19 @@ private:
 	void processGetActive(CommonClientContext &commonContext, SpecificContext *specificContext, const vector<string> &args) {
 		TRACE_POINT();
 		commonContext.requireRights(Account::GET_PARAMETERS);
-		commonContext.channel.write(toString(pool->getActive()).c_str(), NULL);
+		writeArrayMessage(commonContext.fd, toString(pool->getActive()).c_str(), NULL);
 	}
 	
 	void processGetCount(CommonClientContext &commonContext, SpecificContext *specificContext, const vector<string> &args) {
 		TRACE_POINT();
 		commonContext.requireRights(Account::GET_PARAMETERS);
-		commonContext.channel.write(toString(pool->getCount()).c_str(), NULL);
+		writeArrayMessage(commonContext.fd, toString(pool->getCount()).c_str(), NULL);
 	}
 	
 	void processGetGlobalQueueSize(CommonClientContext &commonContext, SpecificContext *specificContext, const vector<string> &args) {
 		TRACE_POINT();
 		commonContext.requireRights(Account::GET_PARAMETERS);
-		commonContext.channel.write(toString(pool->getGlobalQueueSize()).c_str(), NULL);
+		writeArrayMessage(commonContext.fd, toString(pool->getGlobalQueueSize()).c_str(), NULL);
 	}
 	
 	void processSetMaxPerApp(CommonClientContext &commonContext, SpecificContext *specificContext, unsigned int maxPerApp) {
@@ -395,13 +396,13 @@ private:
 	void processGetSpawnServerPid(CommonClientContext &commonContext, SpecificContext *specificContext, const vector<string> &args) {
 		TRACE_POINT();
 		commonContext.requireRights(Account::GET_PARAMETERS);
-		commonContext.channel.write(toString(pool->getSpawnServerPid()).c_str(), NULL);
+		writeArrayMessage(commonContext.fd, toString(pool->getSpawnServerPid()).c_str(), NULL);
 	}
 	
 	void processInspect(CommonClientContext &commonContext, SpecificContext *specificContext, const vector<string> &args) {
 		TRACE_POINT();
 		commonContext.requireRights(Account::INSPECT_BASIC_INFO);
-		commonContext.channel.writeScalar(pool->inspect());
+		writeScalarMessage(commonContext.fd, pool->inspect());
 	}
 	
 	void processToXml(CommonClientContext &commonContext, SpecificContext *specificContext, const vector<string> &args) {
@@ -410,7 +411,7 @@ private:
 		bool includeSensitiveInfo =
 			commonContext.account->hasRights(Account::INSPECT_SENSITIVE_INFO) &&
 			args[1] == "true";
-		commonContext.channel.writeScalar(pool->toXml(includeSensitiveInfo));
+		writeScalarMessage(commonContext.fd, pool->toXml(includeSensitiveInfo));
 	}
 	
 public:

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.9"
+#define PASSENGER_VERSION "3.0.10"
 
 #define FEEDBACK_FD 3
 

data/ext/common/EventedMessageServer.h

@@ -28,6 +28,8 @@
 #include <boost/shared_ptr.hpp>
 #include <ev++.h>
 #include <cstdarg>
+#include <cstdlib>
+#include <alloca.h>
 #include "EventedServer.h"
 #include "MessageReadersWriters.h"
 #include "AccountsDatabase.h"
@@ -87,7 +89,8 @@ public:
 		}
 		va_end(ap);
 		
-		StaticString args[count + 1];
+		StaticString *args = (StaticString *)
+			alloca((count + 1) * sizeof(StaticString));
 		unsigned int i = 1;
 		
 		args[0] = name;
@@ -109,7 +112,8 @@ public:
 	void writeArrayMessage(StaticString args[], unsigned int count) {
 		char headerBuf[sizeof(uint16_t)];
 		unsigned int outSize = ArrayMessage::outputSize(count);
-		StaticString out[outSize];
+		StaticString *out = (StaticString *)
+			alloca(outSize * sizeof(StaticString));
 		
 		ArrayMessage::generate(args, count, headerBuf, out, outSize);
 		write(out, outSize);

data/ext/common/IniFile.h

@@ -176,7 +176,7 @@ protected:
 	}
 
 	void accept() {
-		if (upcomingChar == EOF) return;
+		if ((int) upcomingChar == EOF) return;
 	
 		lastAcceptedChar = (char)iniFileStream.get();
 		upcomingChar     = (char)iniFileStream.peek();
@@ -189,7 +189,7 @@ protected:
 	}
 
 	void ignore() {
-		if (upcomingChar == EOF) return;
+		if ((int) upcomingChar == EOF) return;
 	
 		upcomingChar = (char)iniFileStream.peek();
 		currentColumn++;
@@ -261,7 +261,7 @@ protected:
 		int column = currentColumn;
 		string result;
 	
-		while (upcomingChar != '\n' && upcomingChar != EOF) {
+		while (upcomingChar != '\n' && (int) upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}
@@ -282,7 +282,7 @@ protected:
 		int column = currentColumn;
 		string result;
 	
-		while (upcomingChar != EOF) {
+		while ((int) upcomingChar != EOF) {
 			result.append(1, upcomingChar);
 			accept();
 		}

data/ext/common/Logging.h

@@ -696,7 +696,7 @@ public:
 	template<typename T>
 	static bool instanceof(const std::exception &e) {
 		try {
-			dynamic_cast<const T &>(e);
+			(void) dynamic_cast<const T &>(e);
 			return true;
 		} catch (const bad_cast &) {
 			return false;

data/ext/common/LoggingAgent/LoggingServer.h

@@ -49,11 +49,11 @@
 #include "../MessageReadersWriters.h"
 #include "../StaticString.h"
 #include "../Exceptions.h"
-#include "../MessageChannel.h"
 #include "../Constants.h"
 #include "../Utils.h"
 #include "../Utils/MD5.h"
 #include "../Utils/IOUtils.h"
+#include "../Utils/MessageIO.h"
 #include "../Utils/StrIntUtils.h"
 #include "../Utils/StringMap.h"
 
@@ -68,7 +68,7 @@ using namespace oxt;
 class LoggingServer: public EventedMessageServer {
 private:
 	static const int MAX_LOG_SINK_CACHE_SIZE = 512;
-	static const int GARBAGE_COLLECTION_TIMEOUT = (int) (1.25 * 60 * 60);  // 1 hour 15 minutes
+	static const int GARBAGE_COLLECTION_TIMEOUT = 4500;  // 1 hour 15 minutes
 	
 	struct LogSink;
 	typedef shared_ptr<LogSink> LogSinkPtr;

data/ext/common/LoggingAgent/Main.cpp

@@ -44,6 +44,7 @@
 #include "../Exceptions.h"
 #include "../Utils.h"
 #include "../Utils/IOUtils.h"
+#include "../Utils/MessageIO.h"
 #include "../Utils/Base64.h"
 #include "../Utils/VariantMap.h"
 
@@ -265,10 +266,9 @@ main(int argc, char *argv[]) {
 		ev::sig sigquitWatcher(eventLoop);
 		
 		if (feedbackFdAvailable()) {
-			MessageChannel feedbackChannel(FEEDBACK_FD);
 			feedbackFdWatcher.set<&feedbackFdBecameReadable>();
 			feedbackFdWatcher.start(FEEDBACK_FD, ev::READ);
-			feedbackChannel.write("initialized", NULL);
+			writeArrayMessage(FEEDBACK_FD, "initialized", NULL);
 		}
 		sigintWatcher.set<&caughtExitSignal>();
 		sigintWatcher.start(SIGINT);

data/ext/common/MessageChannel.h

@@ -62,68 +62,10 @@ using namespace oxt;
 
 
 /**
- * Convenience class for I/O operations on file descriptors.
- *
- * This class provides convenience methods for:
- *  - sending and receiving raw data over a file descriptor.
- *  - sending and receiving messages over a file descriptor.
- *  - file descriptor passing over a Unix socket.
- *  - data size limit enforcement and time constraint enforcement.
- * All of these methods use exceptions for error reporting.
- *
- * There are two kinds of messages:
- *  - Array messages. These are just a list of strings, and the message
- *    itself has a specific length. The contained strings may not
- *    contain NUL characters (<tt>'\\0'</tt>). Note that an array message
- *    must have at least one element.
- *  - Scalar messages. These are byte strings which may contain arbitrary
- *    binary data. Scalar messages also have a specific length.
- * The protocol is designed to be low overhead, easy to implement and
- * easy to parse.
- *
- * MessageChannel is to be wrapped around a file descriptor. For example:
- * @code
- *    int p[2];
- *    pipe(p);
- *    MessageChannel channel1(p[0]);
- *    MessageChannel channel2(p[1]);
- *    
- *    // Send an array message.
- *    channel2.write("hello", "world !!", NULL);
- *    list<string> args;
- *    channel1.read(args);    // args now contains { "hello", "world !!" }
- *
- *    // Send a scalar message.
- *    channel2.writeScalar("some long string which can contain arbitrary binary data");
- *    string str;
- *    channel1.readScalar(str);
- * @endcode
- *
- * The life time of a MessageChannel is independent from that of the
- * wrapped file descriptor. If a MessageChannel object is destroyed,
- * the file descriptor is not automatically closed. Call close()
- * if you want to close the file descriptor.
- *
- * @note I/O operations are not buffered.
- * @note Be careful with mixing the sending/receiving of array messages,
- *    scalar messages and file descriptors. If you send a collection of any
- *    of these in a specific order, then the receiving side must receive them
- *    in the exact some order. So suppose you first send a message, then a
- *    file descriptor, then a scalar, then the receiving side must first
- *    receive a message, then a file descriptor, then a scalar. If the
- *    receiving side does things in the wrong order then bad things will
- *    happen.
- * @note MessageChannel is not thread-safe, but is reentrant.
- * @note Some methods throw SecurityException and TimeoutException. When these
- *    exceptions are thrown, the channel will be left in an inconsistent state
- *    because only parts of the data have been read. You should close the channel
- *    after having caught these exceptions.
- *
- * @ingroup Support
+ * Convenience wrapper class for MessageIO operations on file descriptors.
  */
 class MessageChannel {
 private:
-	const static char DELIMITER = '\0';
 	int fd;
 	
 	#ifdef __OpenBSD__
@@ -196,10 +138,26 @@ public:
 	 * @see read(), write(const char *, ...)
 	 */
 	template<typename StringArrayType>
-	void write(const StringArrayType &args) {
+	void writeEx(const StringArrayType &args) {
 		writeArrayMessage(fd, args);
 	}
 	
+	void write(const vector<StaticString> &args) {
+		writeArrayMessageEx(fd, args);
+	}
+	
+	void write(const vector<string> &args) {
+		writeArrayMessageEx(fd, args);
+	}
+	
+	void write(const list<StaticString> &args) {
+		writeArrayMessageEx(fd, args);
+	}
+	
+	void write(const list<string> &args) {
+		writeArrayMessageEx(fd, args);
+	}
+	
 	/**
 	 * Send an array message, which consists of the given strings, over the underlying
 	 * file descriptor. Like <tt>write(const char *name, ...)</tt> but takes a va_list
@@ -465,9 +423,9 @@ public:
 	 */
 	int readFileDescriptor(bool negotiate = true) {
 		if (negotiate) {
-			Passenger::readFileDescriptorWithNegotiation(fd);
+			return Passenger::readFileDescriptorWithNegotiation(fd);
 		} else {
-			Passenger::readFileDescriptor(fd);
+			return Passenger::readFileDescriptor(fd);
 		}
 	}