passenger 3.0.21 → 3.9.1.beta

data/ext/common/MessageReadersWriters.h

@@ -501,6 +501,25 @@ public:
 		output[0] = StaticString(headerBuf, sizeof(uint32_t));
 		output[1] = data;
 	}
+
+	// output must be at least count + 1 in length
+	static void generate(const StaticString data[], unsigned int count,
+		char headerBuf[sizeof(uint32_t)], StaticString *output)
+	{
+		unsigned int i;
+		uint32_t totalSize = 0;
+
+		for (i = 0; i < count; i++) {
+			if (OXT_UNLIKELY(data[i].size() > 0xFFFFFFFF)) {
+				throw ArgumentException("Data size exceeds maximum size for scalar messages.");
+			}
+			totalSize += data[i].size();
+			output[i + 1] = data[i];
+		}
+
+		Uint32Message::generate(headerBuf, totalSize);
+		output[0] = StaticString(headerBuf, sizeof(uint32_t));
+	}
 };
 
 } // namespace Passenger

data/ext/common/MessageServer.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -40,15 +40,15 @@
 #include <cerrno>
 #include <cassert>
 
-#include "Account.h"
-#include "AccountsDatabase.h"
-#include "Constants.h"
-#include "FileDescriptor.h"
-#include "MessageChannel.h"
-#include "Logging.h"
-#include "Exceptions.h"
-#include "Utils/StrIntUtils.h"
-#include "Utils/IOUtils.h"
+#include <Account.h>
+#include <AccountsDatabase.h>
+#include <Constants.h>
+#include <FileDescriptor.h>
+#include <Logging.h>
+#include <Exceptions.h>
+#include <Utils/StrIntUtils.h>
+#include <Utils/IOUtils.h>
+#include <Utils/MessageIO.h>
 
 namespace Passenger {
 
@@ -182,15 +182,12 @@ public:
 		/** The client's socket file descriptor. */
 		FileDescriptor fd;
 		
-		/** The channel that's associated with the client's socket. */
-		MessageChannel channel;
-		
 		/** The account with which the client authenticated. */
 		AccountPtr account;
 		
 		
 		CommonClientContext(FileDescriptor &theFd, AccountPtr &theAccount)
-			: fd(theFd), channel(theFd), account(theAccount)
+			: fd(theFd), account(theAccount)
 		{ }
 		
 		/** Returns a string representation for this client context. */

data/ext/common/MultiLibeio.cpp

@@ -0,0 +1,198 @@
+/*
+ *  Phusion Passenger - http://www.modrails.com/
+ *  Copyright (c) 2011 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#include <MultiLibeio.h>
+#include <oxt/thread.hpp>
+#include <oxt/system_calls.hpp>
+#include <cassert>
+
+#ifndef PREAD_AND_PWRITE_ARE_NOT_THREADSAFE
+	#ifdef __APPLE__
+		#define PREAD_AND_PWRITE_ARE_NOT_THREADSAFE 1
+	#else
+		#define PREAD_AND_PWRITE_ARE_NOT_THREADSAFE 0
+	#endif
+#endif
+
+
+namespace Passenger {
+
+using namespace oxt;
+
+static boost::mutex syncher;
+static condition_variable cond;
+static bool shouldPoll = false;
+static oxt::thread *thr = NULL;
+static bool quit = false;
+
+
+struct Data {
+	SafeLibevPtr libev;
+	MultiLibeio::Callback callback;
+
+	Data(const SafeLibevPtr &_libev, const MultiLibeio::Callback &_callback)
+		: libev(_libev),
+		  callback(_callback)
+		{ }
+};
+
+struct CustomData: public Data {
+	MultiLibeio::ExecuteCallback execute;
+
+	CustomData(const SafeLibevPtr &_libev,
+		const MultiLibeio::Callback &_callback,
+		const MultiLibeio::ExecuteCallback &_execute)
+		: Data(_libev, _callback),
+		  execute(_execute)
+		{ }
+};
+
+
+static void
+threadMain() {
+	unique_lock<boost::mutex> l(syncher);
+	while (!quit) {
+		while (!shouldPoll && !quit) {
+			cond.wait(l);
+		}
+		if (!quit) {
+			shouldPoll = false;
+			l.unlock();
+			eio_poll();
+			l.lock();
+		}
+	}
+}
+
+static void
+wantPoll() {
+	lock_guard<boost::mutex> l(syncher);
+	shouldPoll = true;
+	cond.notify_one();
+}
+
+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));
+	return 0;
+}
+
+static void
+executeWrapper(eio_req *req) {
+	CustomData *data = (CustomData *) req->data;
+	data->execute(req);
+}
+
+#if PREAD_AND_PWRITE_ARE_NOT_THREADSAFE
+	static boost::mutex preadWriteLock;
+
+	static void
+	lockedPread(int fd, void *buf, size_t length, off_t offset, eio_req *req) {
+		lock_guard<boost::mutex> l(preadWriteLock);
+		req->result = pread(fd, buf, length, offset);
+	}
+
+	static void
+	lockedPwrite(int fd, void *buf, size_t length, off_t offset, eio_req *req) {
+		lock_guard<boost::mutex> l(preadWriteLock);
+		req->result = pwrite(fd, buf, length, offset);
+	}
+#endif
+
+void
+MultiLibeio::init() {
+	eio_init(wantPoll, NULL);
+	thr = new oxt::thread(threadMain, "MultiLibeio dispatcher", 1024 * 64);
+}
+
+void
+MultiLibeio::shutdown() {
+	unique_lock<boost::mutex> l(syncher);
+	quit = true;
+	cond.notify_one();
+	l.unlock();
+	thr->join();
+	delete thr;
+	thr = NULL;
+	quit = false;
+}
+
+#define MAKE_REQUEST(code) \
+	eio_req *result; \
+	Data *data = new Data(libev, callback); \
+	code \
+	if (result == NULL) { \
+		delete data; \
+		return NULL; \
+	} else { \
+		return result; \
+	}
+
+eio_req *
+MultiLibeio::open(const char *path, int flags, mode_t mode, int pri, const Callback &callback) {
+	MAKE_REQUEST(
+		result = eio_open(path, flags, mode, pri, dispatch, data);
+	);
+}
+
+eio_req *
+MultiLibeio::read(int fd, void *buf, size_t length, off_t offset, int pri, const Callback &callback) {
+	#if PREAD_AND_PWRITE_ARE_NOT_THREADSAFE
+		return custom(boost::bind(lockedPread, fd, buf, length, offset, _1),
+			pri, callback);
+	#else
+		MAKE_REQUEST(
+			result = eio_read(fd, buf, length, offset, pri, dispatch, data);
+		);
+	#endif
+}
+
+eio_req *
+MultiLibeio::write(int fd, void *buf, size_t length, off_t offset, int pri, const Callback &callback) {
+	#if PREAD_AND_PWRITE_ARE_NOT_THREADSAFE
+		return custom(boost::bind(lockedPwrite, fd, buf, length, offset, _1),
+			pri, callback);
+	#else
+		MAKE_REQUEST(
+			result = eio_write(fd, buf, length, offset, pri, dispatch, data);
+		);
+	#endif
+}
+
+eio_req *
+MultiLibeio::custom(const ExecuteCallback &execute, int pri, const Callback &callback) {
+	CustomData *data = new CustomData(libev, callback, execute);
+	eio_req *result = eio_custom(executeWrapper, pri, dispatch, data);
+	if (result == NULL) {
+		delete data;
+		return NULL;
+	} else {
+		return result;
+	}
+}
+
+
+} // namespace Passenger

data/ext/common/MultiLibeio.h

@@ -0,0 +1,67 @@
+/*
+ *  Phusion Passenger - http://www.modrails.com/
+ *  Copyright (c) 2011 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_MULTI_LIBEIO_H_
+#define _PASSENGER_MULTI_LIBEIO_H_
+
+#include <boost/function.hpp>
+#include <eio.h>
+#include <SafeLibev.h>
+
+namespace Passenger {
+
+using namespace boost;
+
+
+class MultiLibeio {
+private:
+	SafeLibevPtr libev;
+
+public:
+	typedef function<void (eio_req *req)> ExecuteCallback;
+	typedef function<void (eio_req req)> Callback;
+
+	static void init();
+	static void shutdown();
+
+	MultiLibeio() { }
+
+	MultiLibeio(const SafeLibevPtr &_libev)
+		: libev(_libev)
+		{ }
+
+	const SafeLibevPtr &getLibev() const {
+		return libev;
+	}
+
+	eio_req *open(const char *path, int flags, mode_t mode, int pri, const Callback &callback);
+	eio_req *read(int fd, void *buf, size_t length, off_t offset, int pri, const Callback &callback);
+	eio_req *write(int fd, void *buf, size_t length, off_t offset, int pri, const Callback &callback);
+	eio_req *custom(const ExecuteCallback &execute, int pri, const Callback &callback);
+};
+
+
+} // namespace Passenger
+
+#endif /* _PASSENGER_MULTI_LIBEIO_H_ */

data/ext/common/ResourceLocator.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 Phusion
+ *  Copyright (c) 2010, 2011, 2012 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -36,65 +36,56 @@ using namespace boost;
 
 
 /**
- * Locates various Phusion Passenger resources on the filesystem.
+ * Locates various Phusion Passenger resources on the filesystem. All Phusion Passenger
+ * files are located through this class. There's similar code in lib/phusion_passenger.rb.
+ * See doc/Packaging.txt.md for an introduction about where Phusion Passenger expects its
+ * files to be located.
  */
 class ResourceLocator {
 private:
+	string root;
+	string binDir;
 	string agentsDir;
 	string helperScriptsDir;
 	string resourcesDir;
 	string docDir;
 	string rubyLibDir;
-	string compilableSourceDir;
-	string apache2Module;
 	
-	string getOption(const string &file, const IniFileSectionPtr &section, const string &key) const {
+	static string getOption(const string &file, const IniFileSectionPtr &section, const string &key) {
 		if (section->hasKey(key)) {
 			return section->get(key);
 		} else {
-			throw RuntimeException("Option '" + key + "' missing in file " + file);
+			throw RuntimeException("Option '" + key + "' missing in file '" + file + "'");
 		}
 	}
 	
 public:
 	ResourceLocator(const string &rootOrFile) {
-		FileType rootOrFileType = getFileType(rootOrFile);
-		if (rootOrFileType == FT_DIRECTORY || rootOrFileType == FT_NONEXISTANT) {
-			string root = rootOrFile;
-			bool nativelyPackaged = !fileExists(root + "/Rakefile") ||
-				!fileExists(root + "/DEVELOPERS.TXT");
-			
-			if (nativelyPackaged) {
-				agentsDir           = "/usr/lib/phusion-passenger/agents";
-				helperScriptsDir    = "/usr/share/phusion-passenger/helper-scripts";
-				resourcesDir        = "/usr/share/phusion-passenger";
-				docDir              = "/usr/share/doc/phusion-passenger";
-				rubyLibDir          = "";
-				compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
-				apache2Module       = "/usr/lib/apache2/modules/mod_passenger.so";
-			} else {
-				agentsDir           = root + "/agents";
-				helperScriptsDir    = root + "/helper-scripts";
-				resourcesDir        = root + "/resources";
-				docDir              = root + "/doc";
-				rubyLibDir          = root + "/lib";
-				compilableSourceDir = root;
-				apache2Module       = root + "ext/apache2/mod_passenger.so";
-			}
-			
-		} else {
+		root = rootOrFile;
+		if (getFileType(rootOrFile) == FT_REGULAR) {
 			string file = rootOrFile;
 			IniFileSectionPtr options = IniFile(file).section("locations");
+			binDir              = getOption(file, options, "bin");
 			agentsDir           = getOption(file, options, "agents");
 			helperScriptsDir    = getOption(file, options, "helper_scripts");
 			resourcesDir        = getOption(file, options, "resources");
 			docDir              = getOption(file, options, "doc");
 			rubyLibDir          = getOption(file, options, "rubylib");
-			compilableSourceDir = getOption(file, options, "compilable_source");
-			apache2Module       = getOption(file, options, "apache2_module");
+		} else {
+			string root = rootOrFile;
+			binDir              = root + "/bin";
+			agentsDir           = root + "/agents";
+			helperScriptsDir    = root + "/helper-scripts";
+			resourcesDir        = root + "/resources";
+			docDir              = root + "/doc";
+			rubyLibDir          = root + "/lib";
 		}
 	}
 	
+	string getRoot() const {
+		return root;
+	}
+	
 	string getAgentsDir() const {
 		return agentsDir;
 	}
@@ -119,14 +110,6 @@ public:
 	string getRubyLibDir() const {
 		return rubyLibDir;
 	}
-	
-	string getCompilableSourceDir() const {
-		return compilableSourceDir;
-	}
-	
-	string getApache2ModuleFilename() const {
-		return apache2Module;
-	}
 };