passenger 4.0.2 → 4.0.3

data/ext/common/MultiLibeio.cpp

@@ -54,7 +54,9 @@ struct Data {
 	Data(const SafeLibevPtr &_libev, const MultiLibeio::Callback &_callback)
 		: libev(_libev),
 		  callback(_callback)
-		{ }
+	{
+		assert(_libev != NULL);
+	}
 };
 
 struct CustomData: public Data {
@@ -96,7 +98,7 @@ static int
 dispatch(eio_req *req) {
 	auto_ptr<Data> data((Data *) req->data);
 	assert(data->libev != NULL); // Check for strange bug.
-	data->libev->runLaterTS(boost::bind(data->callback, *req));
+	data->libev->runLater(boost::bind(data->callback, *req));
 	return 0;
 }
 

data/ext/common/SafeLibev.h

@@ -58,23 +58,9 @@ private:
 			{ }
 	};
 
-	struct Timer {
-		ev_timer realTimer;
-		SafeLibev *self;
-		Callback callback;
-		list<Timer *>::iterator it;
-
-		Timer(SafeLibev *_self, const Callback &_callback)
-			: self(_self),
-			  callback(_callback)
-			{ }
-	};
-	
 	struct ev_loop *loop;
 	pthread_t loopThread;
 	ev_async async;
-	ev_idle idle;
-	list<Timer *> timers;
 	
 	boost::mutex syncher;
 	condition_variable cond;
@@ -86,17 +72,9 @@ private:
 		self->runCommands();
 	}
 
-	static void idleHandler(EV_P_ ev_idle *idle, int revents) {
-		SafeLibev *self = (SafeLibev *) idle->data;
-		self->runCommands();
-	}
-
-	static void timeoutHandler(EV_P_ ev_timer *t, int revents) {
-		auto_ptr<Timer> timer((Timer *) ((const char *) t));
-		SafeLibev *self = timer->self;
-		self->timers.erase(timer->it);
-		ev_timer_stop(self->loop, &timer->realTimer);
-		timer->callback();
+	static void timeoutHandler(int revents, void *arg) {
+		auto_ptr<Callback> callback((Callback *) arg);
+		(*callback)();
 	}
 
 	void runCommands() {
@@ -151,12 +129,9 @@ public:
 		nextCommandId = 0;
 		
 		ev_async_init(&async, asyncHandler);
+		ev_set_priority(&async, EV_MAXPRI);
 		async.data = this;
 		ev_async_start(loop, &async);
-
-		ev_idle_init(&idle, idleHandler);
-		ev_set_priority(&idle, EV_MAXPRI);
-		idle.data = this;
 	}
 	
 	~SafeLibev() {
@@ -166,15 +141,6 @@ public:
 
 	void destroy() {
 		ev_async_stop(loop, &async);
-		ev_idle_stop(loop, &idle);
-
-		list<Timer *>::iterator it, end = timers.end();
-		for (it = timers.begin(); it != end; it++) {
-			Timer *timer = *it;
-			ev_timer_stop(loop, &timer->realTimer);
-			delete timer;
-		}
-		timers.clear();
 	}
 	
 	struct ev_loop *getLoop() const {
@@ -249,36 +215,23 @@ public:
 		}
 	}
 
-	void runAsync(const Callback &callback) {
-		runLaterTS(callback);
-	}
-
-	// TODO: make it possible to call this from a thread
+	/** Run a callback after a certain timeout. */
 	void runAfter(unsigned int timeout, const Callback &callback) {
 		assert(callback != NULL);
-		Timer *timer = new Timer(this, callback);
-		ev_timer_init(&timer->realTimer, timeoutHandler, timeout / 1000.0, 0);
-		timers.push_front(timer);
-		timer->it = timers.begin();
-		ev_timer_start(loop, &timer->realTimer);
+		ev_once(loop, -1, 0, timeout / 1000.0, timeoutHandler, new Callback(callback));
 	}
 
-	unsigned int runLater(const Callback &callback) {
+	/** Thread-safe version of runAfter(). */
+	void runAfterTS(unsigned int timeout, const Callback &callback) {
 		assert(callback != NULL);
-		unsigned int result;
-		{
-			unique_lock<boost::mutex> l(syncher);
-			commands.push_back(Command(nextCommandId, callback));
-			result = nextCommandId;
-			incNextCommandId();
-		}
-		if (!ev_is_active(&idle)) {
-			ev_idle_start(loop, &idle);
+		if (pthread_equal(pthread_self(), loopThread)) {
+			runAfter(timeout, callback);
+		} else {
+			runLater(boost::bind(&SafeLibev::runAfter, this, timeout, callback));
 		}
-		return result;
 	}
-	
-	unsigned int runLaterTS(const Callback &callback) {
+
+	unsigned int runLater(const Callback &callback) {
 		assert(callback != NULL);
 		unsigned int result;
 		{
@@ -292,7 +245,7 @@ public:
 	}
 
 	/**
-	 * Cancels a callback that was scheduled to be run by runLater() and runLaterTS().
+	 * Cancels a callback that was scheduled to be run by runLater().
 	 * Returns whether the command has been successfully cancelled or not.
 	 * That is, a return value of true guarantees that the callback will not be called
 	 * in the future, while a return value of false means that the callback has already

data/ext/common/ServerInstanceDir.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -52,7 +52,7 @@ public:
 	// Don't forget to update lib/phusion_passenger/admin_tools/server_instance.rb too.
 	static const int DIR_STRUCTURE_MAJOR_VERSION = 1;
 	static const int DIR_STRUCTURE_MINOR_VERSION = 0;
-	static const int GENERATION_STRUCTURE_MAJOR_VERSION = 1;
+	static const int GENERATION_STRUCTURE_MAJOR_VERSION = 2;
 	static const int GENERATION_STRUCTURE_MINOR_VERSION = 0;
 	
 	class Generation: public noncopyable {
@@ -179,7 +179,9 @@ public:
 			return number;
 		}
 		
-		string getPath() const {
+		// The 'const strng &' here is on purpose. The AgentsStarter C
+		// functions return the string pointer directly.
+		const string &getPath() const {
 			return path;
 		}
 		
@@ -236,28 +238,6 @@ private:
 	}
 	
 public:
-	ServerInstanceDir(pid_t webServerPid, const string &parentDir = "", bool owner = true) {
-		string theParentDir;
-		
-		if (parentDir.empty()) {
-			theParentDir = getSystemTempDir();
-		} else {
-			theParentDir = parentDir;
-		}
-		
-		/* We embed the super structure version in the server instance directory name
-		 * because it's possible to upgrade Phusion Passenger without changing the
-		 * web server's PID. This way each incompatible upgrade will use its own
-		 * server instance directory.
-		 */
-		initialize(theParentDir + "/passenger." +
-			toString(DIR_STRUCTURE_MAJOR_VERSION) + "." +
-			toString(DIR_STRUCTURE_MINOR_VERSION) + "." +
-			toString<unsigned long long>(webServerPid),
-			owner);
-		
-	}
-	
 	ServerInstanceDir(const string &path, bool owner = true) {
 		initialize(path, owner);
 	}
@@ -280,7 +260,9 @@ public:
 		}
 	}
 	
-	string getPath() const {
+	// The 'const strng &' here is on purpose. The AgentsStarter C
+	// functions return the string pointer directly.
+	const string &getPath() const {
 		return path;
 	}
 	
@@ -307,6 +289,8 @@ public:
 	}
 	
 	GenerationPtr getGeneration(unsigned int number) const {
+		// Must not used make_shared() here because Watchdog.cpp
+		// deletes the raw pointer in cleanupAgentsInBackground().
 		return ptr(new Generation(path, number));
 	}
 	

data/ext/common/Utils.cpp

@@ -712,7 +712,7 @@ verifyWSGIDir(const string &dir, CachedFileStat *cstat, unsigned int throttleRat
 
 void
 prestartWebApps(const ResourceLocator &locator, const string &ruby,
-	const string &serializedprestartURLs)
+	const vector<string> &prestartURLs)
 {
 	/* Apache calls the initialization routines twice during startup, and
 	 * as a result it starts two helper servers, where the first one exits
@@ -724,11 +724,9 @@ prestartWebApps(const ResourceLocator &locator, const string &ruby,
 	
 	this_thread::disable_interruption di;
 	this_thread::disable_syscall_interruption dsi;
-	vector<string> prestartURLs;
 	vector<string>::const_iterator it;
 	string prespawnScript = locator.getHelperScriptsDir() + "/prespawn";
 	
-	split(Base64::decode(serializedprestartURLs), '\0', prestartURLs);
 	it = prestartURLs.begin();
 	while (it != prestartURLs.end() && !this_thread::interruption_requested()) {
 		if (it->empty()) {

data/ext/common/Utils.h

@@ -366,7 +366,7 @@ bool verifyWSGIDir(const string &dir, CachedFileStat *cstat = 0,
                    unsigned int throttleRate = 0);
 
 void prestartWebApps(const ResourceLocator &locator, const string &ruby,
-	const string &serializedprestartURLs);
+	const vector<string> &prestartURLs);
 
 /**
  * Runs the given function and catches any tracable_exceptions. Upon catching such an exception,

data/ext/common/Utils/StrIntUtils.cpp

@@ -121,6 +121,15 @@ replaceString(const string &str, const string &toFind, const string &replaceWith
 	}
 }
 
+string
+replaceAll(const string &str, const string &toFind, const string &replaceWith) {
+	string result = str;
+	while (result.find(toFind) != string::npos) {
+		result = replaceString(result, toFind, replaceWith);
+	}
+	return result;
+}
+
 string
 strip(const StaticString &str) {
 	const char *data = str.data();

data/ext/common/Utils/StrIntUtils.h

@@ -103,6 +103,11 @@ void splitIncludeSep(const StaticString & restrict_ref str,
  */
 string replaceString(const string &str, const string &toFind, const string &replaceWith);
 
+/**
+ * Like replaceString(), but replace all occurrences of `toFind`.
+ */
+string replaceAll(const string &str, const string &toFind, const string &replaceWith);
+
 /**
  * Strips leading and trailing whitespaces.
  */

data/ext/common/Utils/VariantMap.h

@@ -29,9 +29,12 @@
 #include <oxt/macros.hpp>
 #include <sys/types.h>
 #include <map>
+#include <set>
+#include <vector>
 #include <string>
 #include <Exceptions.h>
 #include <Utils/StrIntUtils.h>
+#include <Utils/Base64.h>
 #include <Utils/MessageIO.h>
 
 namespace Passenger {
@@ -124,19 +127,25 @@ public:
 		}
 		unsigned int i = 0;
 		while (i < argc) {
-			store[argv[i]] = argv[i + 1];
+			string name = argv[i];
+			if (startsWith(name, "--")) {
+				name.erase(0, 2);
+			}
+			name = replaceAll(name, "-", "_");
+
+			store[name] = replaceAll(argv[i + 1], "-", "_");
 			i += 2;
 		}
 	}
 	
 	/**
-	 * Populates a VariantMap from the data in <em>fd</em>. MessageIO
+	 * Populates a VariantMap from the data in `fd`. MessageIO
 	 * is used to read from the file descriptor.
 	 *
 	 * @throws SystemException
 	 * @throws IOException
 	 */
-	void readFrom(int fd) {
+	void readFrom(int fd, const StaticString &messageName = "VariantMap") {
 		TRACE_POINT();
 		vector<string> args;
 		
@@ -146,7 +155,7 @@ public:
 		if (args.size() == 0) {
 			throw IOException("Unexpected empty message received from channel");
 		}
-		if (args[0] != "VariantMap") {
+		if (args[0] != messageName) {
 			throw IOException("Unexpected message '" + args[0] + "' received from channel");
 		}
 		if (args.size() % 2 != 1) {
@@ -165,19 +174,26 @@ public:
 	}
 	
 	VariantMap &set(const string &name, const string &value) {
-		store[name] = value;
+		if (value.empty()) {
+			map<string, string>::iterator it = store.find(name);
+			if (it != store.end()) {
+				store.erase(it);
+			}
+		} else {
+			store[name] = value;
+		}
 		return *this;
 	}
 
 	VariantMap &setDefault(const string &name, const string &value) {
 		if (store.find(name) == store.end()) {
-			store[name] = value;
+			set(name, value);
 		}
 		return *this;
 	}
 	
 	VariantMap &setInt(const string &name, int value) {
-		store[name] = toString(value);
+		set(name, toString(value));
 		return *this;
 	}
 
@@ -189,7 +205,7 @@ public:
 	}
 	
 	VariantMap &setULL(const string &name, unsigned long long value) {
-		store[name] = toString(value);
+		set(name, toString(value));
 		return *this;
 	}
 
@@ -201,7 +217,7 @@ public:
 	}
 	
 	VariantMap &setPid(const string &name, pid_t value) {
-		store[name] = toString((unsigned long long) value);
+		set(name, toString((unsigned long long) value));
 		return *this;
 	}
 
@@ -213,7 +229,7 @@ public:
 	}
 	
 	VariantMap &setUid(const string &name, uid_t value) {
-		store[name] = toString((long long) value);
+		set(name, toString((long long) value));
 		return *this;
 	}
 
@@ -225,7 +241,7 @@ public:
 	}
 	
 	VariantMap &setGid(const string &name, gid_t value) {
-		store[name] = toString((long long) value);
+		set(name, toString((long long) value));
 		return *this;
 	}
 
@@ -237,7 +253,7 @@ public:
 	}
 	
 	VariantMap &setBool(const string &name, bool value) {
-		store[name] = value ? "true" : "false";
+		set(name, value ? "true" : "false");
 		return *this;
 	}
 
@@ -248,6 +264,18 @@ public:
 		return *this;
 	}
 
+	VariantMap &setStrSet(const string &name, const std::set<string> &value) {
+		std::set<string>::const_iterator it;
+		string result;
+
+		for (it = value.begin(); it != value.end(); it++) {
+			result.append(*it);
+			result.append(1, '\0');
+		}
+		set(name, Base64::encode(result));
+		return *this;
+	}
+
 	const string &get(const string &name, bool required = true) const {
 		map<string, string>::const_iterator it = store.find(name);
 		if (it == store.end()) {
@@ -329,6 +357,18 @@ public:
 		}
 		return result;
 	}
+
+	vector<string> getStrSet(const string &name, bool required = true,
+		const vector<string> &defaultValue = vector<string>()) const
+	{
+		vector<string> result = defaultValue;
+		const string *str;
+		if (lookup(name, required, &str)) {
+			result.clear();
+			split(Base64::decode(*str), '\0', result);
+		}
+		return result;
+	}
 	
 	bool erase(const string &name) {
 		return store.erase(name) != 0;
@@ -343,6 +383,15 @@ public:
 	unsigned int size() const {
 		return store.size();
 	}
+
+	void addTo(VariantMap &other) const {
+		map<string, string>::const_iterator it;
+		map<string, string>::const_iterator end = store.end();
+
+		for (it = store.begin(); it != end; it++) {
+			other.set(it->first, it->second);
+		}
+	}
 	
 	/**
 	 * Writes a representation of the contents in this VariantMap to
@@ -351,13 +400,13 @@ public:
 	 *
 	 * @throws SystemException
 	 */
-	void writeToFd(int fd) const {
+	void writeToFd(int fd, const StaticString &messageName = "VariantMap") const {
 		map<string, string>::const_iterator it;
 		map<string, string>::const_iterator end = store.end();
 		vector<string> args;
 		
 		args.reserve(1 + 2 * store.size());
-		args.push_back("VariantMap");
+		args.push_back(messageName);
 		for (it = store.begin(); it != end; it++) {
 			args.push_back(it->first);
 			args.push_back(it->second);