passenger 5.0.26 → 5.0.27

data/build/cxx_tests.rb

@@ -198,7 +198,14 @@ task 'test:cxx' => dependencies do
   if boolean_option('GDB')
     command = "gdb --args #{command}"
   elsif boolean_option('VALGRIND')
-    command = "valgrind --dsymutil=yes --db-attach=yes --child-silent-after-fork=yes #{command}"
+    valgrind_args = "--dsymutil=yes --vgdb=yes --vgdb-error=1 --child-silent-after-fork=yes"
+    if boolean_option('LEAK_CHECK')
+      valgrind_args << " --leak-check=yes"
+    end
+    if RUBY_PLATFORM =~ /darwin/
+      valgrind_args << " --suppressions=valgrind-osx.supp"
+    end
+    command = "valgrind #{valgrind_args} #{command}"
   end
   if boolean_option('SUDO')
     command = "#{PlatformInfo.ruby_sudo_command} #{command}"

data/src/agent/Core/ApplicationPool/TestSession.h

@@ -38,7 +38,11 @@ namespace ApplicationPool2 {
 
 using namespace std;
 
-
+/**
+ * The TestSession represents a session between the Core to the Application. There is a
+ * connection between the two, which is represented by a SocketPair having a first (Core side)
+ * and second (Application side) FD. These are also referred to as fd and peerFd.
+ */
 class TestSession: public AbstractSession {
 private:
 	mutable boost::mutex syncher;

data/src/agent/Core/Controller/CheckoutSession.cpp

@@ -64,7 +64,7 @@ Controller::checkoutSession(Client *client, Request *req) {
 	callback.func = sessionCheckedOut;
 	callback.userData = req;
 
-	options.currentTime = (unsigned long long) (ev_now(getLoop()) * 1000000);
+	options.currentTime = SystemTime::getUsec();
 
 	refRequest(req, __FILE__, __LINE__);
 	#ifdef DEBUG_CC_EVENT_LOOP_BLOCKING

data/src/agent/Core/Controller/ForwardResponse.cpp

@@ -822,6 +822,7 @@ Controller::sendResponseHeaderWithWritev(Client *client, Request *req,
 	if (constructHeaderBuffersForResponse(req, buffers,
 		maxbuffers, nbuffers, dataSize, nCacheableBuffers))
 	{
+		UPDATE_TRACE_POINT();
 		SKC_TRACE(client, 2, "Sending response headers using writev()");
 		logResponseHeaders(client, req, buffers, nbuffers, dataSize);
 		markHeaderBuffersForTurboCaching(client, req, buffers, nCacheableBuffers);
@@ -834,6 +835,7 @@ Controller::sendResponseHeaderWithWritev(Client *client, Request *req,
 		req->responseBegun |= ret > 0;
 		return ret == (ssize_t) dataSize;
 	} else {
+		UPDATE_TRACE_POINT();
 		bytesWritten = 0;
 		return false;
 	}
@@ -843,6 +845,7 @@ void
 Controller::sendResponseHeaderWithBuffering(Client *client, Request *req,
 	unsigned int offset)
 {
+	TRACE_POINT();
 	struct iovec *buffers;
 	unsigned int nbuffers, dataSize, nCacheableBuffers;
 	bool ok;
@@ -858,18 +861,21 @@ Controller::sendResponseHeaderWithBuffering(Client *client, Request *req,
 	assert(ok);
 	(void) ok; // Shut up compiler warning
 
+	UPDATE_TRACE_POINT();
 	logResponseHeaders(client, req, buffers, nbuffers, dataSize);
 	markHeaderBuffersForTurboCaching(client, req, buffers, nCacheableBuffers);
 
 	MemoryKit::mbuf_pool &mbuf_pool = getContext()->mbuf_pool;
 	const unsigned int MBUF_MAX_SIZE = mbuf_pool_data_size(&mbuf_pool);
 	if (dataSize <= MBUF_MAX_SIZE) {
+		UPDATE_TRACE_POINT();
 		SKC_TRACE(client, 2, "Sending response headers using an mbuf");
 		MemoryKit::mbuf buffer(MemoryKit::mbuf_get(&mbuf_pool));
 		gatherBuffers(buffer.start, MBUF_MAX_SIZE, buffers, nbuffers);
 		buffer = MemoryKit::mbuf(buffer, offset, dataSize - offset);
 		writeResponse(client, buffer);
 	} else {
+		UPDATE_TRACE_POINT();
 		SKC_TRACE(client, 2, "Sending response headers using a psg_pool buffer");
 		char *buffer = (char *) psg_pnalloc(req->pool, dataSize);
 		gatherBuffers(buffer, dataSize, buffers, nbuffers);
@@ -882,6 +888,7 @@ Controller::logResponseHeaders(Client *client, Request *req, struct iovec *buffe
 	unsigned int nbuffers, unsigned int dataSize)
 {
 	if (OXT_UNLIKELY(getLogLevel() >= LVL_DEBUG3)) {
+		TRACE_POINT();
 		char *buffer = (char *) psg_pnalloc(req->pool, dataSize);
 		gatherBuffers(buffer, dataSize, buffers, nbuffers);
 		SKC_TRACE(client, 3, "Sending response headers: \"" <<
@@ -889,6 +896,7 @@ Controller::logResponseHeaders(Client *client, Request *req, struct iovec *buffe
 	}
 
 	if (req->useUnionStation()) {
+		TRACE_POINT();
 		const char *status = getStatusCodeAndReasonPhrase(req->appResponse.statusCode);
 		if (status != NULL) {
 			req->logMessage("Status: " + StaticString(status));
@@ -899,6 +907,7 @@ Controller::logResponseHeaders(Client *client, Request *req, struct iovec *buffe
 		if (req->appResponse.statusCode >= 400 && req->appResponse.statusCode <= 599) {
 			// Log the request headers like Request headers: { header1: values1-concatenated, header2: values2-concatenated } (single line)
 			// Concatenation was already done by HeaderTable.h:insert (using a comma ',' for joining, or a semicolon ';' for Cookie headers
+			UPDATE_TRACE_POINT();
 			ServerKit::HeaderTable::Iterator it(req->headers);
 			Json::Value json;
 			while (*it != NULL) {

data/src/agent/Core/Controller/InternalUtils.cpp

@@ -102,7 +102,15 @@ Controller::disconnectWithAppSocketWriteError(Client **client, int e) {
 void
 Controller::endRequestWithAppSocketIncompleteResponse(Client **client, Request **req) {
 	if (!(*req)->responseBegun) {
-		SKC_WARN(*client, "Sending 502 response: application did not send a complete response");
+		// The application might have decided to abort the response because it thinks the client
+		// is already gone (Passenger relays socket half-close events from clients), so don't
+		// make a big warning out of that situation.
+		if ((*req)->halfClosePolicy == Request::HALF_CLOSE_PERFORMED) {
+			SKC_DEBUG(*client, "Sending 502 response: application did not send a complete response"
+				" (likely because client half-closed)");
+		} else {
+			SKC_WARN(*client, "Sending 502 response: application did not send a complete response");
+		}
 		endRequestWithSimpleResponse(client, req,
 			"<h2>Incomplete response received from application</h2>", 502);
 	} else {

data/src/agent/Core/Controller/SendRequest.cpp

@@ -24,9 +24,7 @@
  *  THE SOFTWARE.
  */
 #include <Core/Controller.h>
-
-// For calculating delta_monotonic (Ruby < 2.1 workaround, otherwise unused)
-#include <uv.h>
+#include <Utils/SystemTime.h>
 
 /*************************************************************************
  *
@@ -159,10 +157,18 @@ Controller::sendHeaderToAppWithSessionProtocol(Client *client, Request *req) {
 	SessionProtocolWorkingState state;
 
 	// Workaround for Ruby < 2.1 support.
-	std::string delta_monotonic = boost::to_string(SystemTime::getUsec() - (uv_hrtime() / 1000));
+	std::string deltaMonotonic;
+	unsigned long long now = SystemTime::getUsec();
+	MonotonicTimeUsec monotonicNow = SystemTime::getMonotonicUsec();
+	if (now > monotonicNow) {
+		deltaMonotonic = boost::to_string(now - monotonicNow);
+	} else {
+		long long diff = monotonicNow - now;
+		deltaMonotonic = boost::to_string(-diff);
+	}
 
 	unsigned int bufferSize = determineHeaderSizeForSessionProtocol(req,
-		state, delta_monotonic);
+		state, deltaMonotonic);
 	MemoryKit::mbuf_pool &mbuf_pool = getContext()->mbuf_pool;
 	const unsigned int MBUF_MAX_SIZE = mbuf_pool_data_size(&mbuf_pool);
 	bool ok;
@@ -172,7 +178,7 @@ Controller::sendHeaderToAppWithSessionProtocol(Client *client, Request *req) {
 		bufferSize = MBUF_MAX_SIZE;
 
 		ok = constructHeaderForSessionProtocol(req, buffer.start,
-			bufferSize, state, delta_monotonic);
+			bufferSize, state, deltaMonotonic);
 		assert(ok);
 		buffer = MemoryKit::mbuf(buffer, 0, bufferSize);
 		SKC_TRACE(client, 3, "Header data: \"" << cEscapeString(
@@ -182,7 +188,7 @@ Controller::sendHeaderToAppWithSessionProtocol(Client *client, Request *req) {
 		char *buffer = (char *) psg_pnalloc(req->pool, bufferSize);
 
 		ok = constructHeaderForSessionProtocol(req, buffer,
-			bufferSize, state, delta_monotonic);
+			bufferSize, state, deltaMonotonic);
 		assert(ok);
 		SKC_TRACE(client, 3, "Header data: \"" << cEscapeString(
 			StaticString(buffer, bufferSize)) << "\"");

data/src/agent/Core/Controller/StateInspectionAndConfiguration.cpp

@@ -24,6 +24,7 @@
  *  THE SOFTWARE.
  */
 #include <Core/Controller.h>
+#include <Integrations/LibevJsonUtils.h>
 
 /*************************************************************************
  *
@@ -86,7 +87,7 @@ Controller::inspectStateAsJson() const {
 Json::Value
 Controller::inspectClientStateAsJson(const Client *client) const {
 	Json::Value doc = ParentClass::inspectClientStateAsJson(client);
-	doc["connected_at"] = timeToJson(client->connectedAt * 1000000.0);
+	doc["connected_at"] = evTimeToJson(client->connectedAt, ev_now(getLoop()));
 	return doc;
 }
 
@@ -97,7 +98,7 @@ Controller::inspectRequestStateAsJson(const Request *req) const {
 	const AppResponse *resp = &req->appResponse;
 
 	if (req->startedAt != 0) {
-		doc["started_at"] = timeToJson(req->startedAt * 1000000.0);
+		doc["started_at"] = evTimeToJson(req->startedAt, ev_now(getLoop()));
 	}
 	doc["state"] = req->getStateString();
 	if (req->stickySession) {

data/src/agent/Core/CoreMain.cpp

@@ -1235,6 +1235,9 @@ coreMain(int argc, char *argv[]) {
 		preinitialize, 2);
 	setAgentsOptionsDefaults();
 	sanityCheckOptions();
+
+	restoreOomScore(agentsOptions);
+
 	ret = runCore();
 	shutdownAgent(agentsOptions);
 	return ret;

data/src/agent/Core/SpawningKit/SmartSpawner.h

@@ -344,7 +344,7 @@ private:
 		try {
 			const size_t UNIX_PATH_MAX = sizeof(((struct sockaddr_un *) 0)->sun_path);
 			string data = "You have control 1.0\n"
-				"passenger_root: " + config->resourceLocator->getRoot() + "\n"
+				"passenger_root: " + config->resourceLocator->getInstallSpec() + "\n"
 				"ruby_libdir: " + config->resourceLocator->getRubyLibDir() + "\n"
 				"passenger_version: " PASSENGER_VERSION "\n"
 				"UNIX_PATH_MAX: " + toString(UNIX_PATH_MAX) + "\n";

data/src/agent/Core/SpawningKit/Spawner.h

@@ -270,7 +270,7 @@ private:
 		try {
 			const size_t UNIX_PATH_MAX = sizeof(((struct sockaddr_un *) 0)->sun_path);
 			string data = "You have control 1.0\n"
-				"passenger_root: " + config->resourceLocator->getRoot() + "\n"
+				"passenger_root: " + config->resourceLocator->getInstallSpec() + "\n"
 				"passenger_version: " PASSENGER_VERSION "\n"
 				"ruby_libdir: " + config->resourceLocator->getRubyLibDir() + "\n"
 				"gupid: " + details.gupid + "\n"
@@ -461,7 +461,7 @@ protected:
 	 * <em>timeout</em> miliseconds for the process to exit.
 	 */
 	static int timedWaitpid(pid_t pid, int *status, unsigned long long timeout) {
-		Timer timer;
+		Timer<SystemTime::GRAN_10MSEC> timer;
 		int ret;
 
 		do {

data/src/agent/Core/UnionStation/StopwatchLog.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ *  Copyright (c) 2010-2016 Phusion Holding B.V.
  *
  *  "Passenger", "Phusion Passenger" and "Union Station" are registered
  *  trademarks of Phusion Holding B.V.
@@ -32,7 +32,6 @@
 
 #include <string>
 
-#include <uv.h>
 #include <StaticString.h>
 #include <Exceptions.h>
 #include <Utils/StrIntUtils.h>
@@ -82,7 +81,7 @@ public:
 		pos = appendData(pos, end, "BEGIN: ");
 		pos = appendData(pos, end, id);
 		pos = appendData(pos, end, " (");
-		pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
+		pos = appendData(pos, end, usecToString(SystemTime::getMonotonicUsec()));
 		pos = appendData(pos, end, ",");
 		if (getrusage(RUSAGE_SELF, &usage) == -1) {
 			int e = errno;
@@ -122,7 +121,7 @@ public:
 		}
 		pos = appendData(pos, end, id);
 		pos = appendData(pos, end, " (");
-		pos = appendData(pos, end, usecToString(uv_hrtime() / 1000));
+		pos = appendData(pos, end, usecToString(SystemTime::getMonotonicUsec()));
 		pos = appendData(pos, end, ",");
 		if (getrusage(RUSAGE_SELF, &usage) == -1) {
 			int e = errno;

data/src/agent/Shared/Base.cpp

@@ -64,6 +64,7 @@
 #include <Logging.h>
 #include <ResourceLocator.h>
 #include <Utils.h>
+#include <Utils/SystemTime.h>
 #include <Utils/StrIntUtils.h>
 #ifdef __linux__
 	#include <ResourceLocator.h>
@@ -1500,6 +1501,7 @@ initializeAgent(int argc, char **argv[], const char *processName,
 	if (hasEnvOption("PASSENGER_SIMULATE_SYSCALL_FAILURES")) {
 		initializeSyscallFailureSimulation(processName);
 	}
+	SystemTime::initialize();
 	setvbuf(stdout, NULL, _IONBF, 0);
 	setvbuf(stderr, NULL, _IONBF, 0);
 
@@ -1645,4 +1647,34 @@ shutdownAgent(VariantMap *agentOptions) {
 	oxt::shutdown();
 }
 
+void
+restoreOomScore(VariantMap *agentOptions) {
+	TRACE_POINT();
+
+	string score = agentOptions->get("original_oom_score", false);
+	if (score.empty()) {
+		return;
+	}
+
+	FILE *f;
+	bool legacy = false;
+
+	if (score.at(0) == 'l') {
+		legacy = true;
+		score = score.substr(1);
+		f = fopen("/proc/self/oom_adj", "w");
+	} else {
+		f = fopen("/proc/self/oom_score_adj", "w");
+	}
+
+	if (f != NULL) {
+		fprintf(f, "%s\n", score.c_str());
+		fclose(f);
+	} else {
+		P_WARN("Unable to set OOM score to " << score << " (legacy: " << legacy
+				<< ") due to error: " << strerror(errno)
+				<< " (process will remain at inherited OOM score)");
+	}
+}
+
 } // namespace Passenger

data/src/agent/Shared/Base.h

@@ -51,6 +51,8 @@ void installDiagnosticsDumper(DiagnosticsDumper func, void *userData);
 
 void shutdownAgent(VariantMap *agentOptions);
 
+void restoreOomScore(VariantMap *agentOptions);
+
 }
 
 #endif /* _PASSENGER_AGENT_BASE_H_ */

data/src/agent/UstRouter/UstRouterMain.cpp

@@ -666,5 +666,8 @@ ustRouterMain(int argc, char *argv[]) {
 
 	setAgentsOptionsDefaults();
 	sanityCheckOptions();
+
+	restoreOomScore(agentsOptions);
+
 	return runUstRouter();
 }

data/src/agent/Watchdog/AgentWatcher.cpp

@@ -203,7 +203,7 @@ protected:
 	 * <em>timeout</em> miliseconds for the process to exit.
 	 */
 	static int timedWaitPid(pid_t pid, int *status, unsigned long long timeout) {
-		Timer timer;
+		Timer<SystemTime::GRAN_10MSEC> timer;
 		int ret;
 
 		do {
@@ -308,8 +308,6 @@ public:
 			 * only affects the watchdog but not agents. */
 			setpgid(getpid(), getpid());
 
-			setOomScore(oldOomScore);
-
 			try {
 				execProgram();
 			} catch (...) {

data/src/agent/Watchdog/WatchdogMain.cpp

@@ -162,7 +162,7 @@ static void cleanup(const WorkingObjectsPtr &wo);
 /***** Functions *****/
 
 static FILE *
-openOomAdjFile(const char *mode, OomFileType &type) {
+openOomAdjFileGetType(const char *mode, OomFileType &type) {
 	FILE *f = fopen("/proc/self/oom_score_adj", mode);
 	if (f == NULL) {
 		f = fopen("/proc/self/oom_adj", mode);
@@ -178,6 +178,16 @@ openOomAdjFile(const char *mode, OomFileType &type) {
 	}
 }
 
+static FILE *
+openOomAdjFileForcedType(const char *mode, OomFileType &type) {
+	if (type == OOM_SCORE_ADJ) {
+		return fopen("/proc/self/oom_score_adj", mode);
+	} else {
+		assert(type == OOM_ADJ);
+		return fopen("/proc/self/oom_adj", mode);
+	}
+}
+
 /**
  * Linux-only way to change OOM killer configuration for
  * current process. Requires root privileges, which we
@@ -191,14 +201,24 @@ setOomScore(const StaticString &score) {
 
 	FILE *f;
 	OomFileType type;
+	string filteredScore;
 
-	f = openOomAdjFile("w", type);
+	if (score.at(0) == 'l') {
+		filteredScore = score.substr(1);
+		type = OOM_ADJ;
+	} else {
+		filteredScore = score;
+		type = OOM_SCORE_ADJ;
+	}
+	f = openOomAdjFileForcedType("w", type);
 	if (f != NULL) {
-		size_t ret = fwrite(score.data(), 1, score.size(), f);
+		size_t ret = fwrite(filteredScore.data(), 1, filteredScore.size(), f);
 		// We can't do anything about failures, so ignore compiler
 		// warnings about not doing anything with the result.
 		(void) ret;
 		fclose(f);
+	} else {
+		P_WARN("setOomScore(" << filteredScore << ", " << type << ") failed due to error: " << strerror(errno));
 	}
 }
 
@@ -211,10 +231,14 @@ setOomScoreNeverKill() {
 	FILE *f;
 	OomFileType type;
 
-	f = openOomAdjFile("r", type);
+	f = openOomAdjFileGetType("r", type);
 	if (f == NULL) {
 		return "";
 	}
+	// mark if this is a legacy score so we won't try to write it as OOM_SCORE_ADJ
+	if (type == OOM_ADJ) {
+		oldScore.append("l");
+	}
 	char buf[1024];
 	size_t bytesRead;
 	while (true) {
@@ -230,7 +254,7 @@ setOomScoreNeverKill() {
 	}
 	fclose(f);
 
-	f = openOomAdjFile("w", type);
+	f = openOomAdjFileForcedType("w", type);
 	if (f == NULL) {
 		return "";
 	}
@@ -397,7 +421,7 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 		// Child
 		try {
 			vector<AgentWatcherPtr>::const_iterator it;
-			Timer timer(false);
+			Timer<SystemTime::GRAN_10MSEC> timer(false);
 			fd_set fds, fds2;
 			int max, agentProcessesDone;
 			unsigned long long deadline = 30000; // miliseconds
@@ -781,6 +805,7 @@ initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	agentsOptions = new VariantMap();
 	*agentsOptions = initializeAgent(argc, &argv, SHORT_PROGRAM_NAME " watchdog",
 		parseOptions, NULL, 2);
+	agentsOptions->set("original_oom_score", oldOomScore);
 
 	// Start all sub-agents with this environment variable.
 	setenv("PASSENGER_USE_FEEDBACK_FD", "true", 1);