passenger 3.0.21 → 3.9.1.beta

data/ext/common/Utils/IOUtils.h

@@ -26,8 +26,12 @@
 #define _PASSENGER_IO_UTILS_H_
 
 #include <sys/types.h>
+#include <sys/socket.h>
 #include <sys/uio.h>
+#include <cstdio>
+#include <cstddef>
 #include <unistd.h>
+#include <netdb.h>
 #include <string>
 #include <vector>
 #include <StaticString.h>
@@ -45,6 +49,8 @@ enum ServerAddressType {
 
 typedef ssize_t (*WritevFunction)(int fildes, const struct iovec *iov, int iovcnt);
 
+bool purgeStdio(FILE *f);
+
 /**
  * Accepts a server address in one of the following formats, and returns which one it is:
  *
@@ -163,10 +169,11 @@ int createUnixServer(const StaticString &filename, 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.
+ * Connect to a server at the given address in a blocking manner.
  *
  * @param address An address as accepted by getSocketAddressType().
  * @return The file descriptor of the connected client socket.
+ * @throws ArgumentException Unknown address type.
  * @throws RuntimeException Something went wrong.
  * @throws SystemException Something went wrong while connecting to the server.
  * @throws IOException Something went wrong while connecting to the server.
@@ -176,7 +183,7 @@ int createTcpServer(const char *address = "0.0.0.0", unsigned short port = 0, un
 int connectToServer(const StaticString &address);
 
 /**
- * Connect to a Unix server socket at <tt>filename</tt>.
+ * Connect to a Unix server socket at <tt>filename</tt> in a blocking manner.
  *
  * @param filename The filename of the socket to connect to.
  * @return The file descriptor of the connected client socket.
@@ -188,7 +195,7 @@ int connectToServer(const StaticString &address);
 int connectToUnixServer(const StaticString &filename);
 
 /**
- * Connect to a TCP server socket at the given host name and port.
+ * Connect to a TCP server socket at the given host name and port in a blocking manner.
  *
  * @param hostname The host name of the TCP server.
  * @param port The port number of the TCP server.
@@ -200,6 +207,116 @@ int connectToUnixServer(const StaticString &filename);
  */
 int connectToTcpServer(const StaticString &hostname, unsigned int port);
 
+/** State structure for non-blocking connectToUnixServer(). */
+struct NUnix_State {
+	FileDescriptor fd;
+	string filename;
+};
+
+/**
+ * Setup a Unix domain socket for non-blocking connecting. When done,
+ * the file descriptor can be accessed through <tt>state.fd</tt>.
+ *
+ * @param state A state structure.
+ * @param filename The filename of the socket to connect to.
+ * @throws SystemException Something went wrong.
+ * @throws boost::thread_interrupted A system call has been interrupted.
+ * @ingroup Support
+ */
+void setupNonBlockingUnixSocket(NUnix_State &state, const StaticString &filename);
+
+/**
+ * Connect a Unix domain socket in non-blocking mode.
+ *
+ * @param state A state structure.
+ * @return True if the socket was successfully connected, false if the socket isn't
+ *         ready yet, in which case the caller should select() on the socket until it's writable.
+ * @throws RuntimeException Something went wrong.
+ * @throws SystemException Something went wrong while connecting to the Unix server.
+ * @throws boost::thread_interrupted A system call has been interrupted.
+ * @ingroup Support
+ */
+bool connectToUnixServer(NUnix_State &state);
+
+/** State structure for non-blocking connectToTcpServer(). */
+struct NTCP_State {
+	FileDescriptor fd;
+	struct addrinfo hints, *res;
+	string hostname;
+	int port;
+
+	NTCP_State() {
+		memset(&hints, 0, sizeof(hints));
+		res = NULL;
+		port = 0;
+	}
+
+	~NTCP_State() {
+		if (res != NULL) {
+			freeaddrinfo(res);
+		}
+	}
+};
+
+/**
+ * Setup a TCP socket for non-blocking connecting. When done,
+ * the file descriptor can be accessed through <tt>state.fd</tt>.
+ *
+ * @param state A state structure.
+ * @param hostname The host name of the TCP server.
+ * @param port The port number of the TCP server.
+ * @throws IOException Something went wrong.
+ * @throws SystemException Something went wrong.
+ * @throws boost::thread_interrupted A system call has been interrupted.
+ * @ingroup Support
+ */
+void setupNonBlockingTcpSocket(NTCP_State &state, const StaticString &hostname, int port);
+
+/**
+ * Connect a TCP socket in non-blocking mode.
+ *
+ * @param state A state structure.
+ * @return True if the socket was successfully connected, false if the socket isn't
+ *         ready yet, in which case the caller should select() on the socket until it's writable.
+ * @throws SystemException Something went wrong while connecting to the server.
+ * @throws boost::thread_interrupted A system call has been interrupted.
+ * @ingroup Support
+ */
+bool connectToTcpServer(NTCP_State &state);
+
+struct NConnect_State {
+	ServerAddressType type;
+	NUnix_State s_unix;
+	NTCP_State s_tcp;
+};
+
+/**
+ * Setup a socket for non-blocking connecting to the given address.
+ *
+ * @param A state structure.
+ * @param address An address as accepted by getSocketAddressType().
+ * @throws ArgumentException Unknown address type.
+ * @throws RuntimeException Something went wrong.
+ * @throws SystemException Something went wrong.
+ * @throws IOException Something went wrong.
+ * @throws boost::thread_interrupted A system call has been interrupted.
+ * @ingroup Support
+ */
+void setupNonBlockingSocket(NConnect_State &state, const StaticString &address);
+
+/**
+ * Connect a socket in non-blocking mode.
+ *
+ * @param state A state structure.
+ * @return True if the socket was successfully connected, false if the socket isn't
+ *         ready yet, in which case the caller should select() on the socket until it's writable.
+ * @throws RuntimeException Something went wrong.
+ * @throws SystemException Something went wrong.
+ * @throws boost::thread_interrupted A system call has been interrupted.
+ * @ingroup Support
+ */
+bool connectToServer(NConnect_State &state);
+
 /**
  * Creates a Unix domain socket pair.
  *
@@ -427,6 +544,20 @@ void writeFileDescriptor(int fd, int fdToSend, unsigned long long *timeout = NUL
 	void safelyClose(int fd, bool ignoreErrors = false);
 #endif
 
+/**
+ * Read all data from the given file until EOF.
+ *
+ * @throws SystemException
+ */
+string readAll(const string &filename);
+
+/**
+ * Read all data from the given file descriptor until EOF.
+ *
+ * @throws SystemException
+ */
+string readAll(int fd);
+
 } // namespace Passenger
 
 #endif /* _PASSENGER_IO_UTILS_H_ */

data/ext/common/Utils/Lock.h

@@ -0,0 +1,28 @@
+#ifndef _PASSENGER_LOCK_H_
+#define _PASSENGER_LOCK_H_
+
+#include <boost/thread.hpp>
+
+namespace Passenger {
+
+using namespace boost;
+
+/** Shortcut typedefs. */
+typedef lock_guard<boost::mutex> LockGuard;
+typedef unique_lock<boost::mutex> ScopedLock;
+
+/** Nicer syntax for conditionally locking the mutex during construction. */
+class DynamicScopedLock: public unique_lock<boost::mutex> {
+public:
+	DynamicScopedLock(boost::mutex &m, bool lockNow = true)
+		: unique_lock<boost::mutex>(m, defer_lock)
+	{
+		if (lockNow) {
+			lock();
+		}
+	}
+};
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_LOCK_H_ */

data/ext/common/Utils/MemoryBarrier.h

@@ -0,0 +1,52 @@
+/*
+ *  Phusion Passenger - http://www.modrails.com/
+ *  Copyright (c) 2010 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_MEMORY_BARRIER_H_
+#define _PASSENGER_MEMORY_BARRIER_H_
+
+// Memory barrier macros. Also act as compiler barriers.
+
+#if defined(__GNUC__) || defined(__INTEL_COMPILER)
+	#if defined(__i386__)
+		#if defined(HAS_SSE2) || (defined(HAS_LFENCE) && defined(HAS_SFENCE))
+			#define P_READ_BARRIER() \
+				do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)
+			#define P_WRITE_BARRIER() \
+				do { __asm__ __volatile__ ("sfence" ::: "memory"); } while (false)
+		#else
+			#define P_READ_BARRIER() \
+				do { __asm__ __volatile__ ("" ::: "memory"); } while (false)
+			#define P_WRITE_BARRIER() \
+				do { __asm__ __volatile__ ("lock; addl $0,0(%%esp)" ::: "memory"); } while (false)
+		#endif
+		
+	#elif defined(__x86_64__)
+		#define P_READ_BARRIER() \
+			do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)
+		#define P_WRITE_BARRIER() \
+			do { __asm__ __volatile__ ("sfence" ::: "memory"); } while (false)
+	#endif
+#endif
+
+#endif /* _PASSENGER_MEMORY_BARRIER_H_ */

data/ext/common/Utils/PriorityQueue.h

@@ -0,0 +1,54 @@
+#ifndef _PASSENGER_PRIORITY_QUEUE_H_
+#define _PASSENGER_PRIORITY_QUEUE_H_
+
+#include "fib.h"
+
+namespace Passenger {
+
+template<typename T>
+class PriorityQueue {
+private:
+	struct fibheap heap;
+	
+public:
+	typedef struct fibheap_el * Handle;
+	
+	PriorityQueue() {
+		fh_initheap(&heap);
+		heap.fh_keys = 1;
+	}
+	
+	~PriorityQueue() {
+		fh_destroyheap(&heap);
+	}
+	
+	Handle push(T *item, int priority) {
+		return fh_insertkey(&heap, priority, item);
+	}
+	
+	T *pop() {
+		return (T *) fh_extractmin(&heap);
+	}
+	
+	T *top() const {
+		return (T *) fh_min(const_cast<struct fibheap *>(&heap));
+	}
+	
+	void decrease(Handle handle, int priority) {
+		fh_replacekeydata(&heap, handle, priority, handle->fhe_data);
+	}
+	
+	void erase(Handle handle) {
+		fh_delete(&heap, handle);
+	}
+	
+	void clear() {
+		fh_destroyheap(&heap);
+		fh_initheap(&heap);
+		heap.fh_keys = 1;
+	}
+};
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_PRIORITY_QUEUE_H_ */

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -54,6 +54,7 @@
 #include <Exceptions.h>
 #include <Utils.h>
 #include <Utils/ScopeGuard.h>
+#include <Utils/IOUtils.h>
 
 namespace Passenger {
 
@@ -159,7 +160,6 @@ public:
 			for (it = begin(); it != end; it++) {
 				const ProcessMetrics &metric = it->second;
 				total += metric.realMemory();
-			
 			}
 			
 			shared = -1;
@@ -235,9 +235,10 @@ private:
 	
 	string runCommandAndCaptureOutput(const char **command) const {
 		pid_t pid;
-		int e, p[2];
+		int e;
+		Pipe p;
 		
-		syscalls::pipe(p);
+		p = createPipe();
 		
 		this_thread::disable_syscall_interruption dsi;
 		pid = syscalls::fork();
@@ -254,18 +255,17 @@ private:
 			dup2(p[1], 1);
 			close(p[0]);
 			close(p[1]);
+			closeAllFileDescriptors(2);
 			execvp(command[0], (char * const *) command);
 			_exit(1);
 		} else if (pid == -1) {
 			e = errno;
-			syscalls::close(p[0]);
-			syscalls::close(p[1]);
 			throw SystemException("Cannot fork() a new process", e);
 		} else {
 			bool done = false;
 			string result;
 			
-			syscalls::close(p[1]);
+			p[1].close();
 			while (!done) {
 				char buf[1024 * 4];
 				ssize_t ret;
@@ -274,14 +274,12 @@ private:
 					this_thread::restore_syscall_interruption rsi(dsi);
 					ret = syscalls::read(p[0], buf, sizeof(buf));
 				} catch (const thread_interrupted &) {
-					syscalls::close(p[0]);
 					syscalls::kill(SIGKILL, pid);
 					syscalls::waitpid(pid, NULL, 0);
 					throw;
 				}
 				if (ret == -1) {
 					e = errno;
-					syscalls::close(p[0]);
 					syscalls::kill(SIGKILL, pid);
 					syscalls::waitpid(pid, NULL, 0);
 					throw SystemException("Cannot read output from the 'ps' command", e);
@@ -289,7 +287,7 @@ private:
 				done = ret == 0;
 				result.append(buf, ret);
 			}
-			syscalls::close(p[0]);
+			p[0].close();
 			syscalls::waitpid(pid, NULL, 0);
 			
 			if (result.empty()) {
@@ -519,7 +517,7 @@ public:
 				return;
 			}
 			
-			ScopeGuard fileGuard(boost::bind(syscalls::fclose, f));
+			StdioGuard guard(f);
 			bool hasPss = false;
 			bool hasPrivateDirty = false;
 			bool hasSwap = false;

data/ext/common/Utils/ScopeGuard.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -27,12 +27,19 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/function.hpp>
+#include <cstdio>
 
 namespace Passenger {
 
 using namespace boost;
 
 
+#ifndef _PASSENGER_SAFELY_CLOSE_DEFINED_
+	#define _PASSENGER_SAFELY_CLOSE_DEFINED_
+	void safelyClose(int fd, bool ignoreErrors = false);
+#endif
+
+
 /**
  * Guard object for making sure that a certain function is going to be
  * called when the object goes out of scope. To avoid the function from
@@ -66,6 +73,48 @@ public:
 	}
 };
 
+class StdioGuard: public noncopyable {
+private:
+	FILE *f;
+
+public:
+	StdioGuard()
+		: f(0)
+		{ }
+
+	StdioGuard(FILE *_f)
+		: f(_f)
+		{ }
+	
+	~StdioGuard() {
+		if (f != NULL) {
+			fclose(f);
+		}
+	}
+};
+
+class FdGuard: public noncopyable {
+private:
+	int fd;
+	bool ignoreErrors;
+
+public:
+	FdGuard(int _fd, bool _ignoreErrors = false)
+		: fd(_fd),
+		  ignoreErrors(_ignoreErrors)
+		{ }
+	
+	~FdGuard() {
+		if (fd != -1) {
+			safelyClose(fd, ignoreErrors);
+		}
+	}
+
+	void clear() {
+		fd = -1;
+	}
+};
+
 
 } // namespace Passenger