passenger 4.0.17 → 4.0.18

data/ext/apache2/Hooks.cpp

@@ -45,7 +45,10 @@
 #include <cstdio>
 #include <unistd.h>
 
+#include <oxt/initialize.hpp>
 #include <oxt/macros.hpp>
+#include <oxt/backtrace.hpp>
+#include <oxt/detail/context.hpp>
 #include "Hooks.h"
 #include "Bucket.h"
 #include "Configuration.hpp"
@@ -480,6 +483,17 @@ private:
 	int handleRequest(request_rec *r) {
 		/********** Step 1: preparation work **********/
 		
+		/* Initialize OXT backtrace support if not already done for this thread */
+		if (oxt::get_thread_local_context() == NULL) {
+			/* There is no need to cleanup the context. Apache uses a static
+			 * number of threads per process.
+			 */
+			thread_local_context_ptr context = thread_local_context::make_shared_ptr();
+			unsigned long tid = (unsigned long) pthread_self();
+			context->thread_name = "Worker " + integerToHex(tid);
+			oxt::set_thread_local_context(context);
+		}
+
 		/* Check whether an error occured in prepareRequest() that should be reported
 		 * to the browser.
 		 */
@@ -1583,7 +1597,9 @@ init_module(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *
 	 * universal, i.e. it works for some people but not for others. So we got rid of the
 	 * hacks, and now we always initialize in the post_config hook.
 	 */
-	if (hooks != NULL) {
+	if (hooks == NULL) {
+		oxt::initialize();
+	} else {
 		P_DEBUG("Restarting Phusion Passenger....");
 		delete hooks;
 		hooks = NULL;

data/ext/common/ApplicationPool2/Process.h

@@ -147,6 +147,34 @@ private:
 	/** The handle inside the associated Group's process priority queue. */
 	PriorityQueue<Process>::Handle pqHandle;
 
+	static bool
+	isZombie(pid_t pid) {
+		string filename = "/proc/" + toString(pid) + "/status";
+		FILE *f = fopen(filename.c_str(), "r");
+		if (f == NULL) {
+			// Don't know.
+			return false;
+		}
+
+		bool result = false;
+		while (!feof(f)) {
+			char buf[512];
+			const char *line;
+
+			line = fgets(buf, sizeof(buf), f);
+			if (line == NULL) {
+				break;
+			}
+			if (strcmp(line, "State:	Z (zombie)\n") == 0) {
+				// Is a zombie.
+				result = true;
+				break;
+			}
+		}
+		fclose(f);
+		return result;
+	}
+
 	void indexSessionSockets() {
 		SocketList::iterator it;
 		concurrency = 0;
@@ -458,8 +486,16 @@ public:
 	 */
 	bool osProcessExists() const {
 		if (!dummy && m_osProcessExists) {
-			// Once we detect that a process is gone.
-			m_osProcessExists = syscalls::kill(pid, 0) == 0 || errno != ESRCH;
+			if (syscalls::kill(pid, 0) == 0) {
+				/* On some environments, e.g. Heroku, the init process does
+				 * not properly reap adopted zombie processes, which can interfere
+				 * with our process existance check. To work around this, we
+				 * explicitly check whether or not the process has become a zombie.
+				 */
+				m_osProcessExists = !isZombie(pid);
+			} else {
+				m_osProcessExists = errno != ESRCH;
+			}
 			return m_osProcessExists;
 		} else {
 			return false;

data/ext/common/Constants.h

@@ -42,6 +42,8 @@
 
 	#define DEFAULT_ANALYTICS_LOG_USER "nobody"
 
+	#define DEFAULT_CONCURRENCY_MODEL "process"
+
 	#define DEFAULT_LOG_LEVEL 0
 
 	#define DEFAULT_MAX_INSTANCES_PER_APP 0
@@ -56,6 +58,8 @@
 
 	#define DEFAULT_START_TIMEOUT 90000
 
+	#define DEFAULT_THREAD_COUNT 1
+
 	#define DEFAULT_UNION_STATION_GATEWAY_ADDRESS "gateway.unionstationapp.com"
 
 	#define DEFAULT_UNION_STATION_GATEWAY_PORT 443
@@ -68,7 +72,7 @@
 
 	#define MESSAGE_SERVER_MAX_USERNAME_SIZE 100
 
-	#define PASSENGER_VERSION "4.0.17"
+	#define PASSENGER_VERSION "4.0.18"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/EventedClient.h

@@ -108,7 +108,7 @@ public:
 	typedef void (*Callback)(EventedClient *client);
 	typedef void (*SystemErrorCallback)(EventedClient *client, const string &message, int code);
 	
-private:
+protected:
 	enum {
 		/**
 		 * This is the initial state for a client. It means we're
@@ -694,6 +694,27 @@ public:
 			return oldFd;
 		}
 	}
+
+	const char *getStateName() const {
+		switch (state) {
+		case EC_CONNECTED:
+			return "EC_CONNECTED";
+		case EC_WRITES_PENDING:
+			return "EC_WRITES_PENDING";
+		case EC_TOO_MANY_WRITES_PENDING:
+			return "EC_TOO_MANY_WRITES_PENDING";
+		case EC_RO_CONNECTED:
+			return "EC_RO_CONNECTED";
+		case EC_RO_CONNECTED_WITH_WRITES_PENDING:
+			return "EC_RO_CONNECTED_WITH_WRITES_PENDING";
+		case EC_DISCONNECTING_WITH_WRITES_PENDING:
+			return "EC_DISCONNECTING_WITH_WRITES_PENDING";
+		case EC_DISCONNECTED:
+			return "EC_DISCONNECTED";
+		default:
+			return "unknown";
+		}
+	}
 };
 
 

data/ext/common/EventedMessageServer.h

@@ -67,6 +67,21 @@ struct EventedMessageClientContext {
 		 * it's properly zeroed out. */
 		scalarReader.reset(true);
 	}
+
+	const char *getStateName() const {
+		switch (state) {
+		case MS_READING_USERNAME:
+			return "MS_READING_USERNAME";
+		case MS_READING_PASSWORD:
+			return "MS_READING_PASSWORD";
+		case MS_READING_MESSAGE:
+			return "MS_READING_MESSAGE";
+		case MS_PROCESSING_MESSAGE:
+			return "MS_PROCESSING_MESSAGE";
+		default:
+			return "unknown";
+		}
+	}
 };
 
 class EventedMessageClient: public EventedClient {

data/ext/common/UnionStation.h

@@ -720,7 +720,7 @@ public:
 	
 	LoggerPtr newTransaction(const string &groupName,
 		const string &category = "requests",
-		const string &unionStationKey = string(),
+		const string &unionStationKey = "-",
 		const string &filters = string())
 	{
 		if (serverAddress.empty()) {
@@ -851,7 +851,7 @@ public:
 	LoggerPtr continueTransaction(const string &txnId,
 		const string &groupName,
 		const string &category = "requests",
-		const string &unionStationKey = string())
+		const string &unionStationKey = "-")
 	{
 		if (serverAddress.empty() || txnId.empty()) {
 			return createNullLogger();

data/ext/common/agents/HelperAgent/RequestHandler.h

@@ -125,6 +125,12 @@ class RequestHandler;
 #define RH_DEBUG(client, x) P_DEBUG("[Client " << client->name() << "] " << x)
 #define RH_TRACE(client, level, x) P_TRACE(level, "[Client " << client->name() << "] " << x)
 
+#define RH_LOG_EVENT(client, eventName) \
+	char _clientName[7 + 8]; \
+	snprintf(_clientName, sizeof(_clientName), "Client %d", client->fdnum); \
+	TRACE_POINT_WITH_DATA(_clientName); \
+	RH_TRACE(client, 3, "Event: " eventName)
+
 
 class Client: public enable_shared_from_this<Client> {
 private:
@@ -1069,6 +1075,7 @@ private:
 	}
 
 	size_t onAppInputData(const ClientPtr &client, const StaticString &data) {
+		RH_LOG_EVENT(client, "onAppInputData");
 		if (!client->connected()) {
 			return 0;
 		}
@@ -1110,10 +1117,12 @@ private:
 	}
 
 	void onAppInputChunk(const ClientPtr &client, const StaticString &data) {
+		RH_LOG_EVENT(client, "onAppInputChunk");
 		writeToClientOutputPipe(client, data);
 	}
 
 	void onAppInputEof(const ClientPtr &client) {
+		RH_LOG_EVENT(client, "onAppInputEof");
 		if (!client->connected()) {
 			return;
 		}
@@ -1124,6 +1133,7 @@ private:
 	}
 
 	void onAppInputError(const ClientPtr &client, const char *message, int errorCode) {
+		RH_LOG_EVENT(client, "onAppInputError");
 		if (!client->connected()) {
 			return;
 		}
@@ -1143,6 +1153,7 @@ private:
 	}
 
 	void onClientOutputPipeCommit(const ClientPtr &client) {
+		RH_LOG_EVENT(client, "onClientOutputPipeCommit");
 		if (!client->connected()) {
 			return;
 		}
@@ -1166,6 +1177,7 @@ private:
 	void onClientOutputPipeData(const ClientPtr &client, const char *data,
 		size_t size, const FileBackedPipe::ConsumeCallback &consumed)
 	{
+		RH_LOG_EVENT(client, "onClientOutputPipeData");
 		if (!client->connected()) {
 			return;
 		}
@@ -1196,6 +1208,7 @@ private:
 	}
 
 	void onClientOutputPipeEnd(const ClientPtr &client) {
+		RH_LOG_EVENT(client, "onClientOutputPipeEnd");
 		if (!client->connected()) {
 			return;
 		}
@@ -1206,6 +1219,7 @@ private:
 	}
 
 	void onClientOutputPipeError(const ClientPtr &client, int errorCode) {
+		RH_LOG_EVENT(client, "onClientOutputPipeError");
 		if (!client->connected()) {
 			return;
 		}
@@ -1218,6 +1232,7 @@ private:
 	}
 
 	void onClientOutputWritable(const ClientPtr &client) {
+		RH_LOG_EVENT(client, "onClientOutputWritable");
 		if (!client->connected()) {
 			return;
 		}
@@ -1323,7 +1338,7 @@ private:
 
 
 	size_t onClientInputData(const ClientPtr &client, const StaticString &data) {
-		RH_TRACE(client, 3, "Event: onClientInputData");
+		RH_LOG_EVENT(client, "onClientInputData");
 		if (!client->connected()) {
 			return 0;
 		}
@@ -1374,7 +1389,7 @@ private:
 	}
 
 	void onClientEof(const ClientPtr &client) {
-		RH_TRACE(client, 3, "Event: onClientEof; client sent EOF");
+		RH_LOG_EVENT(client, "onClientEof; client sent EOF");
 		switch (client->state) {
 		case Client::BUFFERING_REQUEST_BODY:
 			state_bufferingRequestBody_onClientEof(client);
@@ -1389,7 +1404,7 @@ private:
 	}
 
 	void onClientInputError(const ClientPtr &client, const char *message, int errnoCode) {
-		RH_TRACE(client, 3, "Event: onClientInputError");
+		RH_LOG_EVENT(client, "onClientInputError");
 		if (!client->connected()) {
 			return;
 		}
@@ -1410,7 +1425,7 @@ private:
 
 
 	void onClientBodyBufferData(const ClientPtr &client, const char *data, size_t size, const FileBackedPipe::ConsumeCallback &consumed) {
-		RH_TRACE(client, 3, "Event: onClientBodyBufferData");
+		RH_LOG_EVENT(client, "onClientBodyBufferData");
 		if (!client->connected()) {
 			return;
 		}
@@ -1425,7 +1440,7 @@ private:
 	}
 
 	void onClientBodyBufferError(const ClientPtr &client, int errorCode) {
-		RH_TRACE(client, 3, "Event: onClientBodyBufferError");
+		RH_LOG_EVENT(client, "onClientBodyBufferError");
 		if (!client->connected()) {
 			return;
 		}
@@ -1438,7 +1453,7 @@ private:
 	}
 
 	void onClientBodyBufferEnd(const ClientPtr &client) {
-		RH_TRACE(client, 3, "Event: onClientBodyBufferEnd");
+		RH_LOG_EVENT(client, "onClientBodyBufferEnd");
 		if (!client->connected()) {
 			return;
 		}
@@ -1453,7 +1468,7 @@ private:
 	}
 
 	void onClientBodyBufferCommit(const ClientPtr &client) {
-		RH_TRACE(client, 3, "Event: onClientBodyBufferCommit");
+		RH_LOG_EVENT(client, "onClientBodyBufferCommit");
 		if (!client->connected()) {
 			return;
 		}
@@ -1468,7 +1483,7 @@ private:
 	}
 
 	void onAppOutputWritable(const ClientPtr &client) {
-		RH_TRACE(client, 3, "Event: onAppOutputWritable");
+		RH_LOG_EVENT(client, "onAppOutputWritable");
 		if (!client->connected()) {
 			return;
 		}
@@ -1487,7 +1502,7 @@ private:
 
 
 	void onTimeout(const ClientPtr &client) {
-		RH_TRACE(client, 3, "Event: onTimeout");
+		RH_LOG_EVENT(client, "onTimeout");
 		if (!client->connected()) {
 			return;
 		}

data/ext/common/agents/LoggingAgent/LoggingServer.h

@@ -389,6 +389,22 @@ private:
 			type = UNINITIALIZED;
 			dataReader.setMaxSize(1024 * 128);
 		}
+
+		template<typename Stream>
+		void inspect(Stream &stream) const {
+			stream << "   * Client " << (int) fd << "\n";
+			stream << "     Initialized      : " << bool(type == LOGGER) << "\n";
+			stream << "     Node name        : " << nodeName << "\n";
+			stream << "     Open transactions: (" << openTransactions.size() << ")";
+			set<string>::const_iterator it, end = openTransactions.end();
+			for (it = openTransactions.begin(); it != end; it++) {
+				stream << " " << *it;
+			}
+			stream << "\n";
+			stream << "     Connection state : " << getStateName() << "\n";
+			stream << "     Message state    : " << messageServer.getStateName() << "\n";
+			stream << "     Outbox           : " << outbox.size() << " bytes\n";
+		}
 	};
 	
 	typedef shared_ptr<Client> ClientPtr;
@@ -639,15 +655,6 @@ private:
 		char writeCountStr[sizeof(unsigned int) * 2 + 1];
 		integerToHexatri(transaction->writeCount, writeCountStr);
 		transaction->writeCount++;
-		transaction->data.reserve(transaction->data.size() +
-			transaction->txnId.size() +
-			1 +
-			timestamp.size() +
-			1 +
-			strlen(writeCountStr) +
-			1 +
-			data.size() +
-			1);
 		transaction->data.append(transaction->txnId);
 		transaction->data.append(" ");
 		transaction->data.append(timestamp);
@@ -863,7 +870,7 @@ protected:
 				}
 				
 				transaction = make_shared<Transaction>(this, ev_now(getLoop()));
-				if (unionStationKey.empty()) {
+				if (unionStationKey.empty() || unionStationKey == "-") {
 					char tempNodeId[MD5_HEX_SIZE];
 					
 					if (nodeId == NULL) {
@@ -1156,7 +1163,13 @@ public:
 		TransactionMap::const_iterator it;
 		TransactionMap::const_iterator end = transactions.end();
 		
-		stream << "Number of clients : " << getClients().size() << "\n";
+		ClientSet::const_iterator cit, cend = getClients().end();
+		stream << "Clients:\n";
+		stream << "  Count: " << getClients().size() << "\n";
+		for (cit = getClients().begin(); cit != cend; cit++) {
+			const Client *client = static_cast<Client *>(*cit);
+			client->inspect(stream);
+		}
 		stream << "\n";
 
 		stream << "RemoteSender:\n";

data/ext/oxt/backtrace.hpp

@@ -39,12 +39,10 @@
  *
  * <h2>Initialization</h2>
  * Every thread that is to contain backtrace information <b>must</b> be
- * initialized. Initialization is done by instantiating an
- * initialize_backtrace_support_for_this_thread object. This includes the main
- * thread as well.
- *
- * If you use oxt::thread, then initialization will be automatically done for
- * you for that partciular thread.
+ * initialized. This is done by creating a `thread_local_context` object,
+ * and calling `set_thread_local_context()` with that object.
+ * `oxt::initialize()` automatically does this for the calling thread,
+ * and `oxt::thread` does this automatically as well.
  *
  * <h2>Basic usage</h2>
  * Backtrace points must be specified manually in the code using TRACE_POINT().

data/ext/oxt/detail/backtrace_disabled.hpp

@@ -33,6 +33,7 @@ namespace oxt {
 
 #define TRACE_POINT() do { /* nothing */ } while (false)
 #define TRACE_POINT_WITH_NAME(name) do { /* nothing */ } while (false)
+#define TRACE_POINT_WITH_DATA(data) do { /* nothing */ } while (false)
 #define UPDATE_TRACE_POINT() do { /* nothing */ } while (false)
 
 } // namespace oxt

data/ext/oxt/detail/backtrace_enabled.hpp

@@ -41,19 +41,25 @@ namespace oxt {
  * Except if you set the 'detached' argument to true.
  */
 struct trace_point {
+	struct detached { };
+
 	const char *function;
 	const char *source;
-	unsigned int line;
+	const char *data;
+	unsigned short line;
 	bool m_detached;
 	
-	trace_point(const char *function, const char *source, unsigned int line);
-	trace_point(const char *function, const char *source, unsigned int line, bool detached);
+	trace_point(const char *function, const char *source, unsigned short line,
+		const char *data = 0);
+	trace_point(const char *function, const char *source, unsigned short line,
+		const char *data, const detached &detached_tag);
 	~trace_point();
-	void update(const char *source, unsigned int line);
+	void update(const char *source, unsigned short line);
 };
 
 #define TRACE_POINT() oxt::trace_point __p(BOOST_CURRENT_FUNCTION, __FILE__, __LINE__)
 #define TRACE_POINT_WITH_NAME(name) oxt::trace_point __p(name, __FILE__, __LINE__)
+#define TRACE_POINT_WITH_DATA(data) oxt::trace_point __p(BOOST_CURRENT_FUNCTION, __FILE__, __LINE__, data)
 #define UPDATE_TRACE_POINT() __p.update(__FILE__, __LINE__)
 
 } // namespace oxt