passenger 4.0.0.rc4 → 4.0.0.rc6

data/ext/common/ApplicationPool2/Process.h

@@ -252,10 +252,17 @@ public:
 		 */
 		DISABLED
 	} enabled;
-	/** Marks whether the process requested out-of-band work. If so, we need to
-	 * wait until all sessions have ended and the process has been disabled.
-	 */
-	bool oobwRequested;
+	enum OobwStatus {
+		/** Process is not using out-of-band work. */
+		OOBW_NOT_ACTIVE,
+		/** The process has requested out-of-band work. At some point, the code
+		 * will see this and set the status to OOBW_IN_PROGRESS. */
+		OOBW_REQUESTED,
+		/** An out-of-band work is in progress. We need to wait until all
+		 * sessions have ended and the process has been disabled before the
+		 * out-of-band work can be performed. */
+		OOBW_IN_PROGRESS,
+	} oobwStatus;
 	/** Caches whether or not the OS process still exists. */
 	mutable bool m_osProcessExists;
 	/** Collected by Pool::collectAnalytics(). */
@@ -291,7 +298,7 @@ public:
 		  processed(0),
 		  lifeStatus(ALIVE),
 		  enabled(ENABLED),
-		  oobwRequested(false),
+		  oobwStatus(OOBW_NOT_ACTIVE),
 		  m_osProcessExists(true)
 	{
 		SpawnerConfigPtr config;
@@ -526,30 +533,42 @@ public:
 		stream << "<uptime>" << uptime() << "</uptime>";
 		switch (lifeStatus) {
 		case ALIVE:
-			stream << "<life_status>alive</life_status>";
+			stream << "<life_status>ALIVE</life_status>";
 			break;
 		case SHUTTING_DOWN:
-			stream << "<life_status>shutting_down</life_status>";
+			stream << "<life_status>SHUTTING_DOWN</life_status>";
 			break;
 		case SHUT_DOWN:
-			stream << "<life_status>shut_down</life_status>";
+			stream << "<life_status>SHUT_DOWN</life_status>";
 			break;
 		default:
 			P_BUG("Unknown 'lifeStatus' state " << (int) lifeStatus);
 		}
 		switch (enabled) {
 		case ENABLED:
-			stream << "<enabled>enabled</enabled>";
+			stream << "<enabled>ENABLED</enabled>";
 			break;
 		case DISABLING:
-			stream << "<enabled>disabling</enabled>";
+			stream << "<enabled>DISABLING</enabled>";
 			break;
 		case DISABLED:
-			stream << "<enabled>disabled</enabled>";
+			stream << "<enabled>DISABLED</enabled>";
 			break;
 		default:
 			P_BUG("Unknown 'enabled' state " << (int) enabled);
 		}
+		if (metrics.isValid()) {
+			stream << "<has_metrics>true</has_metrics>";
+			stream << "<cpu>" << (int) metrics.cpu << "</cpu>";
+			stream << "<rss>" << metrics.rss << "</rss>";
+			stream << "<pss>" << metrics.pss << "</pss>";
+			stream << "<private_dirty>" << metrics.privateDirty << "</private_dirty>";
+			stream << "<swap>" << metrics.swap << "</swap>";
+			stream << "<real_memory>" << metrics.realMemory() << "</real_memory>";
+			stream << "<vmsize>" << metrics.vmsize << "</vmsize>";
+			stream << "<process_group_id>" << metrics.processGroupId << "</process_group_id>";
+			stream << "<command>" << escapeForXml(metrics.command) << "</command>";
+		}
 		if (includeSockets) {
 			SocketList::const_iterator it;
 

data/ext/common/ApplicationPool2/SmartSpawner.h

@@ -122,7 +122,9 @@ private:
 		command.push_back(agentsDir + "/SpawnPreparer");
 		command.push_back(serializeEnvvarsFromPoolOptions(options));
 		command.push_back(preloaderCommand[0]);
-		command.push_back("Passenger AppPreloader: " + options.appRoot);
+		// Note: do not try to set a process title here.
+		// https://code.google.com/p/phusion-passenger/issues/detail?id=855
+		command.push_back(preloaderCommand[0]);
 		for (unsigned int i = 1; i < preloaderCommand.size(); i++) {
 			command.push_back(preloaderCommand[i]);
 		}

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 "4.0.0.rc4"
+#define PASSENGER_VERSION "4.0.0.rc6"
 
 #define FEEDBACK_FD 3
 

data/ext/common/EventedBufferedInput.h

@@ -285,6 +285,10 @@ public:
 		return state == END_OF_STREAM;
 	}
 
+	void readNow() {
+		onReadable(watcher, 0);
+	}
+
 	const FileDescriptor &getFd() const {
 		return fd;
 	}

data/ext/common/Utils.cpp

@@ -41,6 +41,10 @@
 #include <limits.h>
 #include <unistd.h>
 #include <signal.h>
+#ifdef __linux__
+	#include <sys/syscall.h>
+	#include <features.h>
+#endif
 #include <vector>
 #include <FileDescriptor.h>
 #include <MessageServer.h>
@@ -707,7 +711,9 @@ verifyWSGIDir(const string &dir, CachedFileStat *cstat, unsigned int throttleRat
 }
 
 void
-prestartWebApps(const ResourceLocator &locator, const string &serializedprestartURLs) {
+prestartWebApps(const ResourceLocator &locator, const string &ruby,
+	const string &serializedprestartURLs)
+{
 	/* Apache calls the initialization routines twice during startup, and
 	 * as a result it starts two helper servers, where the first one exits
 	 * after a short idle period. We want any prespawning requests to reach
@@ -743,7 +749,8 @@ prestartWebApps(const ResourceLocator &locator, const string &serializedprestart
 				syscalls::close(i);
 			}
 			
-			execlp(prespawnScript.c_str(),
+			execlp(ruby.c_str(),
+				ruby.c_str(),
 				prespawnScript.c_str(),
 				it->c_str(),
 				(char *) 0);
@@ -957,6 +964,17 @@ runShellCommand(const StaticString &command) {
 	}
 }
 
+// Async-signal safe way to fork().
+// http://sourceware.org/bugzilla/show_bug.cgi?id=4737
+pid_t
+asyncFork() {
+	#if defined(__linux__)
+		return (pid_t) syscall(SYS_fork);
+	#else
+		return fork();
+	#endif
+}
+
 // Async-signal safe way to get the current process's hard file descriptor limit.
 static int
 getFileDescriptorLimit() {
@@ -1036,7 +1054,7 @@ getHighestFileDescriptor() {
 	}
 	
 	do {
-		pid = fork();
+		pid = asyncFork();
 	} while (pid == -1 && errno == EINTR);
 	
 	if (pid == 0) {

data/ext/common/Utils.h

@@ -365,7 +365,8 @@ bool verifyRackDir(const string &dir, CachedFileStat *cstat = 0,
 bool verifyWSGIDir(const string &dir, CachedFileStat *cstat = 0,
                    unsigned int throttleRate = 0);
 
-void prestartWebApps(const ResourceLocator &locator, const string &serializedprestartURLs);
+void prestartWebApps(const ResourceLocator &locator, const string &ruby,
+	const string &serializedprestartURLs);
 
 /**
  * Runs the given function and catches any tracable_exceptions. Upon catching such an exception,
@@ -410,6 +411,12 @@ void disableMallocDebugging();
  */
 int runShellCommand(const StaticString &command);
 
+/**
+ * Async-signal safe way to fork().
+ * http://sourceware.org/bugzilla/show_bug.cgi?id=4737
+ */
+pid_t asyncFork();
+
 /**
  * Close all file descriptors that are higher than <em>lastToKeepOpen</em>.
  * This function is async-signal safe. But make sure there are no other

data/ext/common/Utils/HttpHeaderBufferer.h

@@ -80,7 +80,7 @@ private:
 public:
 	HttpHeaderBufferer() {
 		sbmh_init(&u.terminatorFinder,
-			&staticData.occ,
+			NULL,
 			(const unsigned char *) "\r\n\r\n",
 			4);
 		max = 1024 * 128;

data/ext/common/Utils/IOUtils.cpp

@@ -744,7 +744,8 @@ writeExact(int fd, const void *data, unsigned int size, unsigned long long *time
 
 void
 writeExact(int fd, const StaticString &data, unsigned long long *timeout) {
-	writeExact(fd, data.c_str(), data.size(), timeout);
+	const char * restrict data_ptr = data.data();
+	writeExact(fd, data_ptr, data.size(), timeout);
 }
 
 /**
@@ -792,7 +793,7 @@ staticStringArrayToIoVec(const StaticString ary[], size_t count, struct iovec *v
  */
 static void
 findDataPositionIndexAndOffset(struct iovec data[], size_t count,
-	size_t position, size_t *index, size_t *offset)
+	size_t position, size_t * restrict index, size_t * restrict offset)
 {
 	size_t i;
 	size_t begin = 0;
@@ -817,7 +818,7 @@ findDataPositionIndexAndOffset(struct iovec data[], size_t count,
 }
 
 ssize_t
-gatheredWrite(int fd, const StaticString data[], unsigned int dataCount, string &restBuffer) {
+gatheredWrite(int fd, const StaticString *data, unsigned int dataCount, string &restBuffer) {
 	size_t totalSize, iovCount, i;
 	ssize_t ret;
 	
@@ -961,7 +962,7 @@ eraseBeginningOfIoVec(struct iovec *iov, size_t count, size_t index, size_t offs
 }
 
 void
-gatheredWrite(int fd, const StaticString data[], unsigned int count, unsigned long long *timeout) {
+gatheredWrite(int fd, const StaticString *data, unsigned int count, unsigned long long *timeout) {
 	struct iovec iov[count];
 	size_t total, iovCount;
 	size_t written = 0;

data/ext/common/Utils/IOUtils.h

@@ -34,6 +34,7 @@
 #include <netdb.h>
 #include <string>
 #include <vector>
+#include <oxt/macros.hpp>
 #include <StaticString.h>
 #include <FileDescriptor.h>
 
@@ -81,7 +82,9 @@ string parseUnixSocketAddress(const StaticString &address);
  *
  * @throw ArgumentException <tt>address</tt> is not a valid TCP socket address.
  */
-void parseTcpSocketAddress(const StaticString &address, string &host, unsigned short &port);
+void parseTcpSocketAddress(const StaticString & restrict_ref address,
+	string & restrict_ref host,
+	unsigned short & restrict_ref port);
 
 /**
  * Returns whether the given socket address (as accepted by getSocketAddressType())
@@ -103,7 +106,10 @@ void setNonBlocking(int fd);
  * Try to call the Linux accept4() system call. If the system call is
  * not available, then -1 is returned and errno is set to ENOSYS.
  */
-int callAccept4(int sock, struct sockaddr *addr, socklen_t *addr_len, int options);
+int callAccept4(int sock,
+	struct sockaddr * restrict addr,
+	socklen_t * restrict addr_len,
+	int options);
 
 /**
  * Resolves the given host name and returns a list of IP addresses.
@@ -116,7 +122,9 @@ int callAccept4(int sock, struct sockaddr *addr, socklen_t *addr_len, int option
  * IP addresses, then these addresses will be shuffled before they are
  * returned in order to improve load balancing.
  */
-vector<string> resolveHostname(const string &hostname, unsigned int port = 0, bool shuffle = true);
+vector<string> resolveHostname(const string &hostname,
+	unsigned int port = 0,
+	bool shuffle = true);
 
 /**
  * Create a new Unix or TCP server socket, depending on the address type.
@@ -134,7 +142,9 @@ vector<string> resolveHostname(const string &hostname, unsigned int port = 0, bo
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int createServer(const StaticString &address, unsigned int backlogSize = 0, bool autoDelete = true);
+int createServer(const StaticString &address,
+	unsigned int backlogSize = 0,
+	bool autoDelete = true);
 
 /**
  * Create a new Unix server socket which is bounded to <tt>filename</tt>.
@@ -149,7 +159,9 @@ int createServer(const StaticString &address, unsigned int backlogSize = 0, bool
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int createUnixServer(const StaticString &filename, unsigned int backlogSize = 0, bool autoDelete = true);
+int createUnixServer(const StaticString &filename,
+	unsigned int backlogSize = 0,
+	bool autoDelete = true);
 
 /**
  * Create a new TCP server socket which is bounded to the given address and port.
@@ -166,7 +178,9 @@ int createUnixServer(const StaticString &filename, unsigned int backlogSize = 0,
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int createTcpServer(const char *address = "0.0.0.0", unsigned short port = 0, unsigned int backlogSize = 0);
+int createTcpServer(const char *address = "0.0.0.0",
+	unsigned short port = 0,
+	unsigned int backlogSize = 0);
 
 /**
  * Connect to a server at the given address in a blocking manner.
@@ -223,7 +237,8 @@ struct NUnix_State {
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-void setupNonBlockingUnixSocket(NUnix_State &state, const StaticString &filename);
+void setupNonBlockingUnixSocket(NUnix_State & restrict_ref state,
+	const StaticString & restrict_ref filename);
 
 /**
  * Connect a Unix domain socket in non-blocking mode.
@@ -270,7 +285,9 @@ struct NTCP_State {
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-void setupNonBlockingTcpSocket(NTCP_State &state, const StaticString &hostname, int port);
+void setupNonBlockingTcpSocket(NTCP_State & restrict_ref state,
+	const StaticString & restrict_ref hostname,
+	int port);
 
 /**
  * Connect a TCP socket in non-blocking mode.
@@ -302,7 +319,8 @@ struct NConnect_State {
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-void setupNonBlockingSocket(NConnect_State &state, const StaticString &address);
+void setupNonBlockingSocket(NConnect_State & restrict_ref state,
+	const StaticString & restrict_ref address);
 
 /**
  * Connect a socket in non-blocking mode.
@@ -387,7 +405,7 @@ bool waitUntilWritable(int fd, unsigned long long *timeout);
  *                          <tt>timeout</tt> microseconds.
  * @throws boost::thread_interrupted
  */
-unsigned int readExact(int fd, void *buf, unsigned int size, unsigned long long *timeout = NULL);
+unsigned int readExact(int fd, void * restrict buf, unsigned int size, unsigned long long * restrict timeout = NULL);
 
 /**
  * Writes a block of data to the given file descriptor and blocks until everything
@@ -415,8 +433,8 @@ unsigned int readExact(int fd, void *buf, unsigned int size, unsigned long long
  *                          <tt>timeout</tt> microseconds.
  * @throws boost::thread_interrupted
  */
-void writeExact(int fd, const void *data, unsigned int size, unsigned long long *timeout = NULL);
-void writeExact(int fd, const StaticString &data, unsigned long long *timeout = NULL);
+void writeExact(int fd, const void * restrict data, unsigned int size, unsigned long long * restrict timeout = NULL);
+void writeExact(int fd, const StaticString & restrict_ref data, unsigned long long * restrict timeout = NULL);
 
 /**
  * Writes a bunch of data to the given file descriptor using a gathering I/O interface.
@@ -446,7 +464,7 @@ void writeExact(int fd, const StaticString &data, unsigned long long *timeout =
  *         isn't related to non-blocking writes.
  * @throws boost::thread_interrupted
  */
-ssize_t gatheredWrite(int fd, const StaticString data[], unsigned int dataCount, string &restBuffer);
+ssize_t gatheredWrite(int fd, const StaticString * restrict data, unsigned int dataCount, string & restrict_ref restBuffer);
 
 /**
  * Writes a bunch of data to the given file descriptor using a gathering I/O interface.
@@ -474,7 +492,7 @@ ssize_t gatheredWrite(int fd, const StaticString data[], unsigned int dataCount,
  *                          <tt>timeout</tt> microseconds.
  * @throws boost::thread_interrupted
  */
-void    gatheredWrite(int fd, const StaticString data[], unsigned int dataCount, unsigned long long *timeout = NULL);
+void    gatheredWrite(int fd, const StaticString * restrict data, unsigned int dataCount, unsigned long long * restrict timeout = NULL);
 
 /**
  * Sets a writev-emulating function that gatheredWrite() should call instead of the real writev().

data/ext/common/Utils/MessagePassing.h

@@ -221,7 +221,7 @@ public:
 	MessagePtr recv(const string &name, unsigned long long *timeout = NULL) {
 		unique_lock<boost::mutex> l(syncher);
 		posix_time::ptime deadline;
-		unsigned long long beginTime;
+		unsigned long long beginTime = 0; // Shut up compiler warning.
 		if (timeout != NULL) {
 			beginTime = SystemTime::getUsec();
 			deadline = posix_time::microsec_clock::local_time() +
@@ -260,7 +260,7 @@ public:
 	MessagePtr recvAny(const StringCollection &names, unsigned long long *timeout = NULL) {
 		unique_lock<boost::mutex> l(syncher);
 		posix_time::ptime deadline;
-		unsigned long long beginTime;
+		unsigned long long beginTime = 0; // Shut up compiler warning.
 		if (timeout != NULL) {
 			beginTime = SystemTime::getUsec();
 			deadline = posix_time::microsec_clock::local_time() +

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -39,6 +39,12 @@
 	#include <mach/mach_vm.h>
 	#include <mach/mach_port.h>
 #endif
+#ifndef __NetBSD__
+	// NetBSD does not support -p with multiple PIDs.
+	// https://code.google.com/p/phusion-passenger/issues/detail?id=736
+	#define PS_SUPPORTS_MULTIPLE_PIDS
+	#include <set>
+#endif
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -68,9 +74,9 @@ struct ProcessMetrics {
 	pid_t   ppid;
 	uint8_t cpu;
 	/** Resident Set Size, amount of memory in RAM. Does not include swap.
-	 * 0 if completely swapped out.
+	 * -1 if not yet known, 0 if completely swapped out.
 	 */
-	size_t  rss;
+	ssize_t  rss;
 	/** Proportional Set Size, see measureRealMemory(). Does not include swap.
 	 * -1 if unknown, 0 if completely swapped out.
 	 */
@@ -90,9 +96,11 @@ struct ProcessMetrics {
 	
 	ProcessMetrics() {
 		pid = (pid_t) -1;
+		rss = -1;
 		pss = -1;
 		privateDirty = -1;
 		swap = -1;
+		vmsize = -1;
 	}
 	
 	bool isValid() const {
@@ -114,8 +122,10 @@ struct ProcessMetrics {
 		}
 		if (privateDirty != -1) {
 			return privateDirty + swap;
-		} else {
+		} else if (rss != -1) {
 			return rss + swap;
+		} else {
+			return 0;
 		}
 	}
 };
@@ -321,7 +331,8 @@ private:
 		return string(data, endOfLine - data);
 	}
 	
-	ProcessMetricMap parsePsOutput(const string &output) const {
+	template<typename Collection, typename ConstIterator>
+	ProcessMetricMap parsePsOutput(const string &output, const Collection &allowedPids) const {
 		ProcessMetricMap result;
 		// Ignore first line, it contains the column names.
 		const char *start = strchr(output.c_str(), '\n');
@@ -332,6 +343,14 @@ private:
 				start = NULL;
 			}
 		}
+
+		#ifndef PS_SUPPORTS_MULTIPLE_PIDS
+			set<pid_t> pids;
+			ConstIterator it, end = allowedPids.end();
+			for (it = allowedPids.begin(); it != allowedPids.end(); it++) {
+				pids.insert(*it);
+			}
+		#endif
 		
 		// Parse each line.
 		while (start != NULL) {
@@ -344,14 +363,24 @@ private:
 			metrics.vmsize  = (size_t) readNextWordAsLongLong(&start);
 			metrics.processGroupId = (pid_t) readNextWordAsLongLong(&start);
 			metrics.command = readRestOfLine(start);
-			result[metrics.pid] = metrics;
-			
-			start = strchr(start, '\n');
-			if (start != NULL) {
-				// Skip to beginning of next line.
-				start++;
-				if (*start == '\0') {
-					start = NULL;
+
+			bool pidAllowed;
+			#ifdef PS_SUPPORTS_MULTIPLE_PIDS
+				pidAllowed = true;
+			#else
+				pidAllowed = pids.find(metrics.pid) != pids.end();
+			#endif
+
+			if (pidAllowed) {
+				result[metrics.pid] = metrics;
+				
+				start = strchr(start, '\n');
+				if (start != NULL) {
+					// Skip to beginning of next line.
+					start++;
+					if (*start == '\0') {
+						start = NULL;
+					}
 				}
 			}
 		}
@@ -406,7 +435,10 @@ public:
 			#else
 				"pid,ppid,%cpu,rss,vsize,pgid,command",
 			#endif
-			"-p", pidsArg.c_str(), NULL
+			#ifdef PS_SUPPORTS_MULTIPLE_PIDS
+				"-p", pidsArg.c_str(),
+			#endif
+			NULL
 		};
 		
 		string psOutput = this->psOutput;
@@ -414,7 +446,7 @@ public:
 			psOutput = runCommandAndCaptureOutput(command);
 		}
 		pidsArg.resize(0);
-		ProcessMetricMap result = parsePsOutput(psOutput);
+		ProcessMetricMap result = parsePsOutput<Collection, ConstIterator>(psOutput, pids);
 		psOutput.resize(0);
 		if (canMeasureRealMemory) {
 			ProcessMetricMap::iterator it;