passenger 5.0.4 → 5.0.5

data/ext/common/Utils/IOUtils.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2013 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -233,18 +233,20 @@ resolveHostname(const string &hostname, unsigned int port, bool shuffle) {
 }
 
 int
-createServer(const StaticString &address, unsigned int backlogSize, bool autoDelete) {
+createServer(const StaticString &address, unsigned int backlogSize, bool autoDelete,
+	const char *file, unsigned int line)
+{
 	TRACE_POINT();
 	switch (getSocketAddressType(address)) {
 	case SAT_UNIX:
 		return createUnixServer(parseUnixSocketAddress(address),
-			backlogSize, autoDelete);
+			backlogSize, autoDelete, file, line);
 	case SAT_TCP: {
 		string host;
 		unsigned short port;
 
 		parseTcpSocketAddress(address, host, port);
-		return createTcpServer(host.c_str(), port, backlogSize);
+		return createTcpServer(host.c_str(), port, backlogSize, file, line);
 	}
 	default:
 		throw ArgumentException(string("Unknown address type for '") + address + "'");
@@ -252,7 +254,9 @@ createServer(const StaticString &address, unsigned int backlogSize, bool autoDel
 }
 
 int
-createUnixServer(const StaticString &filename, unsigned int backlogSize, bool autoDelete) {
+createUnixServer(const StaticString &filename, unsigned int backlogSize, bool autoDelete,
+	const char *file, unsigned int line)
+{
 	struct sockaddr_un addr;
 	int fd, ret;
 
@@ -269,7 +273,7 @@ createUnixServer(const StaticString &filename, unsigned int backlogSize, bool au
 		throw SystemException("Cannot create a Unix socket file descriptor", e);
 	}
 
-	FdGuard guard(fd, true);
+	FdGuard guard(fd, file, line, true);
 	addr.sun_family = AF_LOCAL;
 	strncpy(addr.sun_path, filename.c_str(), filename.size());
 	addr.sun_path[filename.size()] = '\0';
@@ -307,7 +311,9 @@ createUnixServer(const StaticString &filename, unsigned int backlogSize, bool au
 }
 
 int
-createTcpServer(const char *address, unsigned short port, unsigned int backlogSize) {
+createTcpServer(const char *address, unsigned short port, unsigned int backlogSize,
+	const char *file, unsigned int line)
+{
 	struct sockaddr_in addr;
 	int fd, ret, optval;
 
@@ -334,7 +340,7 @@ createTcpServer(const char *address, unsigned short port, unsigned int backlogSi
 		throw SystemException("Cannot create a TCP socket file descriptor", e);
 	}
 
-	FdGuard guard(fd, true);
+	FdGuard guard(fd, file, line, true);
 	ret = syscalls::bind(fd, (const struct sockaddr *) &addr, sizeof(addr));
 	if (ret == -1) {
 		int e = errno;
@@ -372,17 +378,17 @@ createTcpServer(const char *address, unsigned short port, unsigned int backlogSi
 }
 
 int
-connectToServer(const StaticString &address) {
+connectToServer(const StaticString &address, const char *file, unsigned int line) {
 	TRACE_POINT();
 	switch (getSocketAddressType(address)) {
 	case SAT_UNIX:
-		return connectToUnixServer(parseUnixSocketAddress(address));
+		return connectToUnixServer(parseUnixSocketAddress(address), file, line);
 	case SAT_TCP: {
 		string host;
 		unsigned short port;
 
 		parseTcpSocketAddress(address, host, port);
-		return connectToTcpServer(host, port);
+		return connectToTcpServer(host, port, file, line);
 	}
 	default:
 		throw ArgumentException(string("Unknown address type for '") + address + "'");
@@ -390,14 +396,16 @@ connectToServer(const StaticString &address) {
 }
 
 int
-connectToUnixServer(const StaticString &filename) {
+connectToUnixServer(const StaticString &filename, const char *file,
+	unsigned int line)
+{
 	int fd = syscalls::socket(PF_UNIX, SOCK_STREAM, 0);
 	if (fd == -1) {
 		int e = errno;
 		throw SystemException("Cannot create a Unix socket file descriptor", e);
 	}
 
-	FdGuard guard(fd, true);
+	FdGuard guard(fd, file, line, true);
 	int ret;
 	struct sockaddr_un addr;
 
@@ -449,8 +457,10 @@ connectToUnixServer(const StaticString &filename) {
 }
 
 void
-setupNonBlockingUnixSocket(NUnix_State &state, const StaticString &filename) {
-	state.fd = syscalls::socket(PF_UNIX, SOCK_STREAM, 0);
+setupNonBlockingUnixSocket(NUnix_State &state, const StaticString &filename,
+	const char *file, unsigned int line)
+{
+	state.fd.assign(syscalls::socket(PF_UNIX, SOCK_STREAM, 0), file, line);
 	if (state.fd == -1) {
 		int e = errno;
 		throw SystemException("Cannot create a Unix socket file descriptor", e);
@@ -494,7 +504,9 @@ connectToUnixServer(NUnix_State &state) {
 }
 
 int
-connectToTcpServer(const StaticString &hostname, unsigned int port) {
+connectToTcpServer(const StaticString &hostname, unsigned int port,
+	const char *file, unsigned int line)
+{
 	struct addrinfo hints, *res;
 	int ret, e, fd;
 
@@ -543,11 +555,15 @@ connectToTcpServer(const StaticString &hostname, unsigned int port) {
 		throw SystemException(message, e);
 	}
 
+	P_LOG_FILE_DESCRIPTOR_OPEN3(fd, file, line);
+
 	return fd;
 }
 
 void
-setupNonBlockingTcpSocket(NTCP_State &state, const StaticString &hostname, int port) {
+setupNonBlockingTcpSocket(NTCP_State &state, const StaticString &hostname, int port,
+	const char *file, unsigned int line)
+{
 	int ret;
 
 	memset(&state.hints, 0, sizeof(state.hints));
@@ -565,7 +581,7 @@ setupNonBlockingTcpSocket(NTCP_State &state, const StaticString &hostname, int p
 		throw IOException(message);
 	}
 
-	state.fd = syscalls::socket(PF_INET, SOCK_STREAM, 0);
+	state.fd.assign(syscalls::socket(PF_INET, SOCK_STREAM, 0), file, line);
 	if (state.fd == -1) {
 		int e = errno;
 		throw SystemException("Cannot create a TCP socket file descriptor", e);
@@ -605,19 +621,22 @@ connectToTcpServer(NTCP_State &state) {
 }
 
 void
-setupNonBlockingSocket(NConnect_State &state, const StaticString &address) {
+setupNonBlockingSocket(NConnect_State &state, const StaticString &address,
+	const char *file, unsigned int line)
+{
 	TRACE_POINT();
 	state.type = getSocketAddressType(address);
 	switch (state.type) {
 	case SAT_UNIX:
-		setupNonBlockingUnixSocket(state.s_unix, parseUnixSocketAddress(address));
+		setupNonBlockingUnixSocket(state.s_unix, parseUnixSocketAddress(address),
+			file, line);
 		break;
 	case SAT_TCP: {
 		string host;
 		unsigned short port;
 
 		parseTcpSocketAddress(address, host, port);
-		setupNonBlockingTcpSocket(state.s_tcp, host, port);
+		setupNonBlockingTcpSocket(state.s_tcp, host, port, file, line);
 		break;
 	}
 	default:
@@ -638,7 +657,7 @@ connectToServer(NConnect_State &state) {
 }
 
 SocketPair
-createUnixSocketPair() {
+createUnixSocketPair(const char *file, unsigned int line) {
 	int fds[2];
 	FileDescriptor sockets[2];
 
@@ -646,14 +665,14 @@ createUnixSocketPair() {
 		int e = errno;
 		throw SystemException("Cannot create a Unix socket pair", e);
 	} else {
-		sockets[0] = fds[0];
-		sockets[1] = fds[1];
+		sockets[0].assign(fds[0], file, line);
+		sockets[1].assign(fds[1], file, line);
 		return SocketPair(sockets[0], sockets[1]);
 	}
 }
 
 Pipe
-createPipe() {
+createPipe(const char *file, unsigned int line) {
 	int fds[2];
 	FileDescriptor p[2];
 
@@ -661,8 +680,8 @@ createPipe() {
 		int e = errno;
 		throw SystemException("Cannot create a pipe", e);
 	} else {
-		p[0] = fds[0];
-		p[1] = fds[1];
+		p[0].assign(fds[0], file, line);
+		p[1].assign(fds[1], file, line);
 		return Pipe(p[0], p[1]);
 	}
 }
@@ -1151,7 +1170,7 @@ string
 readAll(const string &filename) {
 	FILE *f = fopen(filename.c_str(), "rb");
 	if (f != NULL) {
-		StdioGuard guard(f);
+		StdioGuard guard(f, NULL, 0);
 		return readAll(fileno(f));
 	} else {
 		int e = errno;

data/ext/common/Utils/IOUtils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -135,6 +135,9 @@ vector<string> resolveHostname(const string &hostname,
  * @param autoDelete If <tt>address</tt> is a Unix socket that already exists,
  *                   whether that should be deleted. Otherwise this argument
  *                   is ignored.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @return The file descriptor of the newly created server socket.
  * @throws ArgumentException The given address cannot be parsed.
  * @throws RuntimeException Something went wrong.
@@ -144,7 +147,9 @@ vector<string> resolveHostname(const string &hostname,
  */
 int createServer(const StaticString &address,
 	unsigned int backlogSize = 0,
-	bool autoDelete = true);
+	bool autoDelete = true,
+	const char *file = __FILE__,
+	unsigned int line = __LINE__);
 
 /**
  * Create a new Unix server socket which is bounded to <tt>filename</tt>.
@@ -153,6 +158,9 @@ int createServer(const StaticString &address,
  * @param backlogSize The size of the socket's backlog. Specify 0 to use the
  *                    platform's maximum allowed backlog size.
  * @param autoDelete Whether <tt>filename</tt> should be deleted, if it already exists.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @return The file descriptor of the newly created Unix server socket.
  * @throws RuntimeException Something went wrong.
  * @throws SystemException Something went wrong while creating the Unix server socket.
@@ -161,7 +169,9 @@ int createServer(const StaticString &address,
  */
 int createUnixServer(const StaticString &filename,
 	unsigned int backlogSize = 0,
-	bool autoDelete = true);
+	bool autoDelete = true,
+	const char *file = __FILE__,
+	unsigned int line = __LINE__);
 
 /**
  * Create a new TCP server socket which is bounded to the given address and port.
@@ -172,6 +182,9 @@ int createUnixServer(const StaticString &filename,
  *             select a free port.
  * @param backlogSize The size of the socket's backlog. Specify 0 to use the
  *                    platform's maximum allowed backlog size.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @return The file descriptor of the newly created server socket.
  * @throws SystemException Something went wrong while creating the server socket.
  * @throws ArgumentException The given address cannot be parsed.
@@ -180,12 +193,17 @@ int createUnixServer(const StaticString &filename,
  */
 int createTcpServer(const char *address = "0.0.0.0",
 	unsigned short port = 0,
-	unsigned int backlogSize = 0);
+	unsigned int backlogSize = 0,
+	const char *file = __FILE__,
+	unsigned int line = __LINE__);
 
 /**
  * Connect to a server at the given address in a blocking manner.
  *
  * @param address An address as accepted by getSocketAddressType().
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @return The file descriptor of the connected client socket.
  * @throws ArgumentException Unknown address type.
  * @throws RuntimeException Something went wrong.
@@ -194,32 +212,41 @@ int createTcpServer(const char *address = "0.0.0.0",
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int connectToServer(const StaticString &address);
+int connectToServer(const StaticString &address, const char *file,
+	unsigned int line);
 
 /**
  * Connect to a Unix server socket at <tt>filename</tt> in a blocking manner.
  *
  * @param filename The filename of the socket to connect to.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @return The file descriptor of the connected client socket.
  * @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
  */
-int connectToUnixServer(const StaticString &filename);
+int connectToUnixServer(const StaticString &filename, const char *file,
+	unsigned int line);
 
 /**
  * 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.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @return The file descriptor of the connected client socket.
  * @throws IOException Something went wrong while connecting to the Unix server.
  * @throws SystemException Something went wrong while connecting to the server.
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
-int connectToTcpServer(const StaticString &hostname, unsigned int port);
+int connectToTcpServer(const StaticString &hostname, unsigned int port,
+	const char *file, unsigned int line);
 
 /** State structure for non-blocking connectToUnixServer(). */
 struct NUnix_State {
@@ -233,12 +260,16 @@ struct NUnix_State {
  *
  * @param state A state structure.
  * @param filename The filename of the socket to connect to.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @throws SystemException Something went wrong.
  * @throws boost::thread_interrupted A system call has been interrupted.
  * @ingroup Support
  */
 void setupNonBlockingUnixSocket(NUnix_State & restrict_ref state,
-	const StaticString & restrict_ref filename);
+	const StaticString & restrict_ref filename, const char *file,
+	unsigned int line);
 
 /**
  * Connect a Unix domain socket in non-blocking mode.
@@ -280,6 +311,9 @@ struct NTCP_State {
  * @param state A state structure.
  * @param hostname The host name of the TCP server.
  * @param port The port number of the TCP server.
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @throws IOException Something went wrong.
  * @throws SystemException Something went wrong.
  * @throws boost::thread_interrupted A system call has been interrupted.
@@ -287,7 +321,7 @@ struct NTCP_State {
  */
 void setupNonBlockingTcpSocket(NTCP_State & restrict_ref state,
 	const StaticString & restrict_ref hostname,
-	int port);
+	int port, const char *file, unsigned int line);
 
 /**
  * Connect a TCP socket in non-blocking mode.
@@ -312,6 +346,9 @@ struct NConnect_State {
  *
  * @param A state structure.
  * @param address An address as accepted by getSocketAddressType().
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @throws ArgumentException Unknown address type.
  * @throws RuntimeException Something went wrong.
  * @throws SystemException Something went wrong.
@@ -320,7 +357,8 @@ struct NConnect_State {
  * @ingroup Support
  */
 void setupNonBlockingSocket(NConnect_State & restrict_ref state,
-	const StaticString & restrict_ref address);
+	const StaticString & restrict_ref address, const char *file,
+	unsigned int line);
 
 /**
  * Connect a socket in non-blocking mode.
@@ -338,18 +376,24 @@ bool connectToServer(NConnect_State &state);
 /**
  * Creates a Unix domain socket pair.
  *
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @throws SystemException
  * @throws boost::thread_interrupted
  */
-SocketPair createUnixSocketPair();
+SocketPair createUnixSocketPair(const char *file, unsigned int line);
 
 /**
  * Creates a pipe.
  *
+ * @param file The name of the source file that called this function,
+ *             for file descriptor logging purposes.
+ * @param line The line in the source file that called this function.
  * @throws SystemException
  * @throws boost::thread_interrupted
  */
-Pipe createPipe();
+Pipe createPipe(const char *file, unsigned int line);
 
 /**
  * Waits at most <tt>*timeout</tt> microseconds for the file descriptor to become readable.

data/ext/common/Utils/MessagePassing.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012 Phusion
+ *  Copyright (c) 2012-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -112,7 +112,7 @@ struct Message {
 	}
 
 	void sendReply(const string &name) {
-		sendReply(make_shared<Message>(name));
+		sendReply(boost::make_shared<Message>(name));
 	}
 };
 
@@ -205,7 +205,7 @@ public:
 	}
 
 	void send(const string &name) {
-		send(make_shared<Message>(name));
+		send(boost::make_shared<Message>(name));
 	}
 
 	const MessagePtr peek(const string &name) const {