passenger 4.0.48 → 4.0.49

data/ext/common/ResourceLocator.h

@@ -53,7 +53,7 @@ private:
 	string docDir;
 	string rubyLibDir;
 	string nodeLibDir;
-	
+
 	static string getOption(const string &file, const IniFileSectionPtr &section, const string &key) {
 		if (section->hasKey(key)) {
 			return section->get(key);
@@ -61,7 +61,7 @@ private:
 			throw RuntimeException("Option '" + key + "' missing in file '" + file + "'");
 		}
 	}
-	
+
 public:
 	ResourceLocator(const string &rootOrFile) {
 		root = rootOrFile;
@@ -86,27 +86,27 @@ public:
 			nodeLibDir          = root + "/node_lib";
 		}
 	}
-	
+
 	string getRoot() const {
 		return root;
 	}
-	
+
 	string getAgentsDir() const {
 		return agentsDir;
 	}
-	
+
 	string getHelperScriptsDir() const {
 		return helperScriptsDir;
 	}
-	
+
 	string getResourcesDir() const {
 		return resourcesDir;
 	}
-	
+
 	string getDocDir() const {
 		return docDir;
 	}
-	
+
 	// Can be empty.
 	string getRubyLibDir() const {
 		return rubyLibDir;

data/ext/common/SafeLibev.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -29,11 +29,11 @@
 #include <vector>
 #include <list>
 #include <memory>
-#include <climits>
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
+#include <oxt/thread.hpp>
 
 namespace Passenger {
 
@@ -46,27 +46,33 @@ using namespace boost;
  */
 class SafeLibev {
 private:
+	// 2^28-1. Command IDs are 28-bit so that we can pack DataSource's state and
+	// its planId in 32-bits total.
+	static const unsigned int MAX_COMMAND_ID = 268435455;
+
 	typedef boost::function<void ()> Callback;
 
 	struct Command {
-		int id;
 		Callback callback;
+		unsigned int id: 31;
+		bool canceled: 1;
 
 		Command(unsigned int _id, const Callback &_callback)
-			: id(_id),
-			  callback(_callback)
+			: callback(_callback),
+			  id(_id),
+			  canceled(false)
 			{ }
 	};
 
 	struct ev_loop *loop;
 	pthread_t loopThread;
 	ev_async async;
-	
+
 	boost::mutex syncher;
 	boost::condition_variable cond;
 	vector<Command> commands;
 	unsigned int nextCommandId;
-	
+
 	static void asyncHandler(EV_P_ ev_async *w, int revents) {
 		SafeLibev *self = (SafeLibev *) w->data;
 		self->runCommands();
@@ -82,13 +88,15 @@ private:
 		vector<Command> commands = this->commands;
 		this->commands.clear();
 		l.unlock();
-		
+
 		vector<Command>::const_iterator it, end = commands.end();
 		for (it = commands.begin(); it != end; it++) {
-			it->callback();
+			if (!it->canceled) {
+				it->callback();
+			}
 		}
 	}
-	
+
 	template<typename Watcher>
 	void startWatcherAndNotify(Watcher *watcher, bool *done) {
 		watcher->set(loop);
@@ -97,7 +105,7 @@ private:
 		*done = true;
 		cond.notify_all();
 	}
-	
+
 	template<typename Watcher>
 	void stopWatcherAndNotify(Watcher *watcher, bool *done) {
 		watcher->stop();
@@ -105,7 +113,7 @@ private:
 		*done = true;
 		cond.notify_all();
 	}
-	
+
 	void runAndNotify(const Callback *callback, bool *done) {
 		(*callback)();
 		boost::unique_lock<boost::mutex> l(syncher);
@@ -114,26 +122,26 @@ private:
 	}
 
 	void incNextCommandId() {
-		if (nextCommandId == INT_MAX) {
-			nextCommandId = 0;
+		if (nextCommandId == MAX_COMMAND_ID) {
+			nextCommandId = 1;
 		} else {
 			nextCommandId++;
 		}
 	}
-	
+
 public:
 	/** SafeLibev takes over ownership of the loop object. */
 	SafeLibev(struct ev_loop *loop) {
 		this->loop = loop;
 		loopThread = pthread_self();
-		nextCommandId = 0;
-		
+		nextCommandId = 1;
+
 		ev_async_init(&async, asyncHandler);
 		ev_set_priority(&async, EV_MAXPRI);
 		async.data = this;
 		ev_async_start(loop, &async);
 	}
-	
+
 	~SafeLibev() {
 		destroy();
 		ev_loop_destroy(loop);
@@ -142,19 +150,36 @@ public:
 	void destroy() {
 		ev_async_stop(loop, &async);
 	}
-	
+
 	struct ev_loop *getLoop() const {
 		return loop;
 	}
-	
+
 	void setCurrentThread() {
 		loopThread = pthread_self();
+		#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
+			oxt::thread_signature = this;
+		#endif
 	}
 
 	pthread_t getCurrentThread() const {
 		return loopThread;
 	}
-	
+
+	bool onEventLoopThread() const {
+		#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
+			// Avoid double reads of the thread-local variable.
+			const void *sig = oxt::thread_signature;
+			if (OXT_UNLIKELY(sig == NULL)) {
+				return pthread_equal(pthread_self(), loopThread);
+			} else {
+				return sig == this;
+			}
+		#else
+			return pthread_equal(pthread_self(), loopThread);
+		#endif
+	}
+
 	template<typename Watcher>
 	void start(Watcher &watcher) {
 		if (pthread_equal(pthread_self(), loopThread)) {
@@ -173,7 +198,7 @@ public:
 			}
 		}
 	}
-	
+
 	template<typename Watcher>
 	void stop(Watcher &watcher) {
 		if (pthread_equal(pthread_self(), loopThread)) {
@@ -191,7 +216,7 @@ public:
 			}
 		}
 	}
-	
+
 	void run(const Callback &callback) {
 		assert(callback != NULL);
 		if (pthread_equal(pthread_self(), loopThread)) {
@@ -251,14 +276,18 @@ public:
 	 * in the future, while a return value of false means that the callback has already
 	 * been called or is currently being called.
 	 */
-	bool cancelCommand(int id) {
+	bool cancelCommand(unsigned int id) {
+		if (id == 0) {
+			return false;
+		}
+
 		boost::unique_lock<boost::mutex> l(syncher);
 		// TODO: we can do a binary search because the command ID
 		// is monotically increasing except on overflow.
 		vector<Command>::iterator it, end = commands.end();
 		for (it = commands.begin(); it != end; it++) {
 			if (it->id == id) {
-				commands.erase(it);
+				it->canceled = true;
 				return true;
 			}
 		}

data/ext/common/ServerInstanceDir.h

@@ -64,17 +64,17 @@ public:
 	class Generation: public noncopyable {
 	private:
 		friend class ServerInstanceDir;
-		
+
 		string path;
 		unsigned int number;
 		bool owner;
-		
+
 		Generation(const string &serverInstanceDir, unsigned int number) {
 			path = serverInstanceDir + "/generation-" + toString(number);
 			this->number = number;
 			owner = false;
 		}
-		
+
 		void create(bool userSwitching, const string &defaultUser,
 		            const string &defaultGroup, uid_t webServerWorkerUid,
 		            gid_t webServerWorkerGid)
@@ -84,7 +84,7 @@ public:
 			struct passwd *defaultUserEntry;
 			uid_t defaultUid;
 			gid_t defaultGid;
-			
+
 			defaultUserEntry = getpwnam(defaultUser.c_str());
 			if (defaultUserEntry == NULL) {
 				throw NonExistentUserException("Default user '" + defaultUser +
@@ -96,26 +96,26 @@ public:
 				throw NonExistentGroupException("Default group '" + defaultGroup +
 					"' does not exist.");
 			}
-			
+
 			/* We set a very tight permission here: no read or write access for
 			 * anybody except the owner. The individual files and subdirectories
 			 * decide for themselves whether they're readable by anybody.
 			 */
 			makeDirTree(path, "u=rwx,g=x,o=x");
-			
+
 			/* Write structure version file. */
 			string structureVersionFile = path + "/structure_version.txt";
 			createFile(structureVersionFile,
 				toString(SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MAJOR_VERSION) + "." +
 				toString(SERVER_INSTANCE_DIR_GENERATION_STRUCTURE_MINOR_VERSION),
 				S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-			
+
 			string passengerVersionFile = path + "/passenger_version.txt";
 			createFile(passengerVersionFile,
 				PASSENGER_VERSION "\n",
 				S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-			
-			
+
+
 			/* We want the upload buffer directory to be only writable by the web
 			 * server's worker processs. Other users may not have any access to this
 			 * directory.
@@ -126,7 +126,7 @@ public:
 			} else {
 				makeDirTree(path + "/buffered_uploads", "u=rwx,g=,o=");
 			}
-			
+
 			/* The HelperAgent must be able to connect to an application. */
 			if (runningAsRoot) {
 				if (userSwitching) {
@@ -153,10 +153,10 @@ public:
 				 */
 				makeDirTree(path + "/backends", "u=rwx,g=,o=");
 			}
-			
+
 			owner = true;
 		}
-	
+
 	public:
 		~Generation() {
 			destroy();
@@ -167,30 +167,30 @@ public:
 				removeDirTree(path);
 			}
 		}
-		
+
 		unsigned int getNumber() const {
 			return number;
 		}
-		
+
 		// The 'const strng &' here is on purpose. The AgentsStarter C
 		// functions return the string pointer directly.
 		const string &getPath() const {
 			return path;
 		}
-		
+
 		void detach() {
 			owner = false;
 		}
 	};
-	
+
 	typedef boost::shared_ptr<Generation> GenerationPtr;
-	
+
 private:
 	string path;
 	bool owner;
-	
+
 	friend class Generation;
-	
+
 	void initialize(const string &path, bool owner) {
 		TRACE_POINT();
 		struct stat buf;
@@ -198,7 +198,7 @@ private:
 
 		this->path  = path;
 		this->owner = owner;
-		
+
 		/* Create the server instance directory. We only need to write to this
 		 * directory for these reasons:
 		 * 1. Initial population of structure files (structure_version.txt, instance.pid).
@@ -288,7 +288,7 @@ private:
 				path + ", but it has wrong owner and group");
 		}
 	}
-	
+
 	bool isDirectory(const string &dir, struct dirent *entry) const {
 		#ifdef DT_DIR
 			if (entry->d_type == DT_DIR) {
@@ -303,12 +303,12 @@ private:
 		path.append(entry->d_name);
 		return getFileType(path) == FT_DIRECTORY;
 	}
-	
+
 public:
 	ServerInstanceDir(const string &path, bool owner = true) {
 		initialize(path, owner);
 	}
-	
+
 	~ServerInstanceDir() {
 		destroy();
 	}
@@ -330,17 +330,17 @@ public:
 			}
 		}
 	}
-	
+
 	// The 'const strng &' here is on purpose. The AgentsStarter C
 	// functions return the string pointer directly.
 	const string &getPath() const {
 		return path;
 	}
-	
+
 	void detach() {
 		owner = false;
 	}
-	
+
 	GenerationPtr newGeneration(bool userSwitching, const string &defaultUser,
 	                            const string &defaultGroup, uid_t webServerWorkerUid,
 	                            gid_t webServerWorkerGid)
@@ -352,24 +352,24 @@ public:
 		} else {
 			newNumber = 0;
 		}
-		
+
 		GenerationPtr generation(new Generation(path, newNumber));
 		generation->create(userSwitching, defaultUser, defaultGroup,
 			webServerWorkerUid, webServerWorkerGid);
 		return generation;
 	}
-	
+
 	GenerationPtr getGeneration(unsigned int number) const {
 		// Must not used boost::make_shared() here because Watchdog.cpp
 		// deletes the raw pointer in cleanupAgentsInBackground().
 		return ptr(new Generation(path, number));
 	}
-	
+
 	GenerationPtr getNewestGeneration() const {
 		DIR *dir = opendir(path.c_str());
 		struct dirent *entry;
 		int result = -1;
-		
+
 		if (dir == NULL) {
 			int e = errno;
 			throw FileSystemException("Cannot open directory " + path,
@@ -386,7 +386,7 @@ public:
 			}
 		}
 		closedir(dir);
-		
+
 		if (result == -1) {
 			return GenerationPtr();
 		} else {