passenger 3.9.2.beta → 4.0.0.rc4

data/ext/common/Constants.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -26,11 +26,13 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.9.2.beta"
+#define PASSENGER_VERSION "4.0.0.rc4"
 
 #define FEEDBACK_FD 3
 
 #define DEFAULT_LOG_LEVEL 0
+#define DEFAULT_RUBY "ruby"
+#define DEFAULT_PYTHON "python"
 #define DEFAULT_MAX_POOL_SIZE 6
 #define DEFAULT_POOL_IDLE_TIME 300
 #define DEFAULT_MAX_INSTANCES_PER_APP 0

data/ext/common/Exceptions.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.
  *
@@ -301,6 +301,28 @@ public:
 	}
 };
 
+/**
+ * Indicates that a Pool::get() or Pool::asyncGet() request was denied.
+ * The request never reached a process. This could be because, before the
+ * request could reach a process, the administrator detached the containing
+ * SuperGroup. Or maybe the request sat in the queue for too long.
+ */
+class GetAbortedException: public oxt::tracable_exception {
+private:
+	string msg;
+
+public:
+	GetAbortedException(const string &message)
+		: msg(message)
+		{ }
+	
+	virtual ~GetAbortedException() throw() {}
+	
+	virtual const char *what() const throw() {
+		return msg.c_str();
+	}
+};
+
 /**
  * Indicates that a specified argument is incorrect or violates a requirement.
  *

data/ext/common/Logging.cpp

@@ -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.
  *
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <Logging.h>
+#include <Utils/StrIntUtils.h>
 
 namespace Passenger {
 
@@ -55,22 +56,32 @@ setDebugFile(const char *logFile) {
 }
 
 void
-_prepareLogEntry(std::stringstream &sstream) {
+_prepareLogEntry(std::stringstream &sstream, const char *file, unsigned int line) {
 	time_t the_time;
 	struct tm the_tm;
 	char datetime_buf[60];
 	struct timeval tv;
+
+	if (startsWith(file, "ext/")) {
+		file += sizeof("ext/") - 1;
+		if (startsWith(file, "common/")) {
+			file += sizeof("common/") - 1;
+			if (startsWith(file, "ApplicationPool2/")) {
+				file += sizeof("Application") - 1;
+			}
+		}
+	}
 	
 	the_time = time(NULL);
 	localtime_r(&the_time, &the_tm);
 	strftime(datetime_buf, sizeof(datetime_buf) - 1, "%F %H:%M:%S", &the_tm);
 	gettimeofday(&tv, NULL);
 	sstream <<
-		"[ pid=" << std::dec << getpid() <<
-		" thr=" << std::hex << pthread_self() << std::dec <<
-		" time=" << datetime_buf << "." << std::setfill('0') << std::setw(4) <<
+		"[ " << datetime_buf << "." << std::setfill('0') << std::setw(4) <<
 			(unsigned long) (tv.tv_usec / 100) <<
-		" file=" << __FILE__ << ":" << (unsigned long) __LINE__ <<
+		" " << std::dec << getpid() << "/" <<
+			std::hex << pthread_self() << std::dec <<
+		" " << file << ":" << line <<
 		" ]: ";
 }
 

data/ext/common/Logging.h

@@ -62,18 +62,27 @@ extern int _logOutput;
 int getLogLevel();
 void setLogLevel(int value);
 bool setDebugFile(const char *logFile = NULL);
-void _prepareLogEntry(std::stringstream &sstream);
+void _prepareLogEntry(std::stringstream &sstream, const char *file, unsigned int line);
 void _writeLogEntry(const std::string &str);
 
 
+enum PassengerLogLevel {
+	LVL_CRIT   = -2,
+	LVL_ERROR  = -1,
+	LVL_INFO   = 0,
+	LVL_WARN   = 0,
+	LVL_DEBUG  = 1,
+	LVL_DEBUG2 = 2
+};
+
 /**
  * Write the given expression to the log stream.
  */
 #define P_LOG(level, expr) \
 	do { \
-		if (Passenger::_logLevel >= level) { \
+		if (Passenger::_logLevel >= (level)) { \
 			std::stringstream sstream; \
-			Passenger::_prepareLogEntry(sstream); \
+			Passenger::_prepareLogEntry(sstream, __FILE__, __LINE__); \
 			sstream << expr << "\n"; \
 			Passenger::_writeLogEntry(sstream.str()); \
 		} \
@@ -83,25 +92,31 @@ void _writeLogEntry(const std::string &str);
  * Write the given expression, which represents a warning,
  * to the log stream.
  */
-#define P_WARN(expr) P_LOG(0, expr)
+#define P_WARN(expr) P_LOG(LVL_WARN, expr)
 
 /**
  * Write the given expression, which represents a warning,
  * to the log stream.
  */
-#define P_INFO(expr) P_LOG(0, expr)
+#define P_INFO(expr) P_LOG(LVL_INFO, expr)
 
 /**
  * Write the given expression, which represents an error,
  * to the log stream.
  */
-#define P_ERROR(expr) P_LOG(-1, expr)
+#define P_ERROR(expr) P_LOG(LVL_ERROR, expr)
+
+/**
+ * Write the given expression, which represents a critical non-recoverable error,
+ * to the log stream.
+ */
+#define P_CRITICAL(expr) P_LOG(LVL_CRIT, expr)
 
 /**
  * Write the given expression, which represents a debugging message,
  * to the log stream.
  */
-#define P_DEBUG(expr) P_TRACE(1, expr)
+#define P_DEBUG(expr) P_TRACE(LVL_DEBUG, expr)
 
 #ifdef PASSENGER_DEBUG
 	#define P_TRACE(level, expr) P_LOG(level, expr)
@@ -110,6 +125,21 @@ void _writeLogEntry(const std::string &str);
 #endif
 
 
+#define P_BUG(expr) \
+	do { \
+		TRACE_POINT(); \
+		P_CRITICAL("[BUG] " << expr); \
+		abort(); \
+	} while (false)
+
+#define P_BUG_UTP(expr) \
+	do { \
+		UPDATE_TRACE_POINT(); \
+		P_CRITICAL("[BUG] " << expr); \
+		abort(); \
+	} while (false)
+
+
 class NotExpectingExceptions {
 private:
 	this_thread::disable_interruption di;

data/ext/common/ResourceLocator.h

@@ -26,9 +26,9 @@
 #define _PASSENGER_RESOURCE_LOCATOR_H_
 
 #include <string>
-#include <IniFile.h>
 #include <Exceptions.h>
 #include <Utils.h>
+#include <Utils/IniFile.h>
 
 namespace Passenger {
 

data/ext/common/Utils.cpp

@@ -113,7 +113,7 @@ getFileType(const StaticString &filename, CachedFileStat *cstat, unsigned int th
 	int ret;
 	
 	if (cstat != NULL) {
-		ret = cstat->stat(filename.toString(), &buf, throttleRate);
+		ret = cstat->stat(filename, &buf, throttleRate);
 	} else {
 		ret = stat(filename.c_str(), &buf);
 	}
@@ -277,6 +277,54 @@ extractDirName(const StaticString &path) {
 	return result_string;
 }
 
+StaticString
+extractDirNameStatic(const StaticString &path) {
+	breakpoint();
+	if (path.empty()) {
+		return StaticString(".", 1);
+	}
+
+	const char *data = path.data();
+	const char *end = path.data() + path.size();
+
+	// Ignore trailing '/' characters.
+	while (end > data && end[-1] == '/') {
+		end--;
+	}
+	if (end == data) {
+		// Apparently the entire path consists of slashes.
+		return StaticString("/", 1);
+	}
+
+	// Find last '/'.
+	end--;
+	while (end > data && *end != '/') {
+		end--;
+	}
+	if (end == data) {
+		if (*data == '/') {
+			// '/' found, but it's the first character in the path.
+			return StaticString("/", 1);
+		} else {
+			// No '/' found in path.
+			return StaticString(".", 1);
+		}
+	} else {
+		// '/' found and it's not the first character in path.
+		// 'end' points to that '/' character.
+		// Skip to first non-'/' character.
+		while (end >= data && *end == '/') {
+			end--;
+		}
+		if (end < data) {
+			// The entire path consists of '/' characters.
+			return StaticString("/", 1);
+		} else {
+			return StaticString(data, end - data + 1);
+		}
+	}
+}
+
 string
 extractBaseName(const StaticString &path) {
 	char *path_copy = strdup(path.c_str());

data/ext/common/Utils.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010, 2011, 2012 Phusion
+ *  Copyright (c) 2010-2013 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -39,8 +39,9 @@
 #include <cstring>
 #include <errno.h>
 #include <unistd.h>
-#include "StaticString.h"
-#include "Exceptions.h"
+#include <StaticString.h>
+#include <Exceptions.h>
+#include <Utils/LargeFiles.h>
 
 namespace Passenger {
 
@@ -178,6 +179,14 @@ string resolveSymlink(const StaticString &path);
  */
 string extractDirName(const StaticString &path);
 
+/**
+ * Given a path, extracts its directory name. This version does not use
+ * any dynamically allocated storage and does not require `path` to be
+ * NULL-terminated. It returns a StaticString that points either to static
+ * storage, or to a substring of `path`.
+ */
+StaticString extractDirNameStatic(const StaticString &path);
+
 /**
  * Given a path, extracts its base name.
  * <em>path</em> MUST be null-terminated!
@@ -435,7 +444,7 @@ public:
 		
 		snprintf(templ, sizeof(templ), "%s/%s.XXXXXX", dir.c_str(), identifier);
 		templ[sizeof(templ) - 1] = '\0';
-		fd = mkstemp(templ);
+		fd = lfs_mkstemp(templ);
 		if (fd == -1) {
 			char message[1024];
 			int e = errno;

data/ext/common/Utils/CachedFileStat.hpp

@@ -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.
  *
@@ -34,11 +34,12 @@
 #include <cassert>
 #include <string>
 #include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
 #include <oxt/system_calls.hpp>
 
-#include "SystemTime.h"
-#include "StaticString.h"
-#include "Utils/HashMap.h"
+#include <StaticString.h>
+ #include <Utils/SystemTime.h>
+#include <Utils/StringMap.h>
 
 namespace Passenger {
 
@@ -72,13 +73,13 @@ public:
 		time_t last_time;
 		
 		/**
-		 * Checks whether <em>interval</em> seconds have elapsed since <em>begin</em>
-		 * The current time is returned via the <tt>currentTime</tt> argument,
+		 * Checks whether `interval` seconds have elapsed since `begin`.
+		 * The current time is returned via the `currentTime` argument,
 		 * so that the caller doesn't have to call time() again if it needs the current
 		 * time.
 		 *
 		 * @pre begin <= time(NULL)
-		 * @return Whether <tt>interval</tt> seconds have elapsed since <tt>begin</tt>.
+		 * @return Whether `interval` seconds have elapsed since `begin`.
 		 * @throws TimeRetrievalException Something went wrong while retrieving the time.
 		 * @throws boost::thread_interrupted
 		 */
@@ -100,9 +101,10 @@ public:
 		 *
 		 * @param filename The file to stat.
 		 */
-		Entry(const string &filename) {
+		Entry(const string &_filename)
+			: filename(_filename)
+		{
 			memset(&info, 0, sizeof(struct stat));
-			this->filename = filename;
 			last_result = -1;
 			last_errno = 0;
 			last_time = 0;
@@ -141,7 +143,7 @@ public:
 	
 	typedef shared_ptr<Entry> EntryPtr;
 	typedef list<EntryPtr> EntryList;
-	typedef HashMap<string, EntryList::iterator, StaticString::Hash> EntryMap;
+	typedef StringMap<EntryList::iterator> EntryMap;
 	
 	unsigned int maxSize;
 	EntryList entries;
@@ -158,7 +160,7 @@ public:
 	}
 	
 	/**
-	 * Stats the given file. If <tt>throttleRate</tt> seconds have passed since
+	 * Stats the given file. If `throttleRate` seconds have passed since
 	 * the last time stat() was called on this file, then the file will be
 	 * re-stat()ted, otherwise the cached stat information will be returned.
 	 *
@@ -175,35 +177,35 @@ public:
 	 *         SystemException being thrown.
 	 * @throws boost::thread_interrupted
 	 */
-	int stat(const string &filename, struct stat *buf, unsigned int throttleRate = 0) {
+	int stat(const StaticString &filename, struct stat *buf, unsigned int throttleRate = 0) {
 		boost::unique_lock<boost::mutex> l(lock);
-		EntryMap::iterator it(cache.find(filename));
+		EntryList::iterator it(cache.get(filename, entries.end()));
 		EntryPtr entry;
 		int ret;
 		
-		if (it == cache.end()) {
+		if (it == entries.end()) {
 			// Filename not in cache.
 			// If cache is full, remove the least recently used
 			// cache entry.
 			if (maxSize != 0 && cache.size() == maxSize) {
 				EntryList::iterator listEnd(entries.end());
 				listEnd--;
-				string filename((*listEnd)->filename);
+				string filename2((*listEnd)->filename);
 				entries.pop_back();
-				cache.erase(filename);
+				cache.remove(filename2);
 			}
 			
 			// Add to cache as most recently used.
-			entry = EntryPtr(new Entry(filename));
+			entry = make_shared<Entry>(filename);
 			entries.push_front(entry);
-			cache[filename] = entries.begin();
+			cache.set(filename, entries.begin());
 		} else {
 			// Cache hit.
-			entry = *it->second;
+			entry = *it;
 			
 			// Mark this cache item as most recently used.
-			entries.splice(entries.begin(), entries, it->second);
-			cache[filename] = entries.begin();
+			entries.splice(entries.begin(), entries, it);
+			cache.set(filename, entries.begin());
 		}
 		ret = entry->refresh(throttleRate);
 		*buf = entry->info;
@@ -224,18 +226,18 @@ public:
 			for (int i = 0; i < toRemove; i++) {
 				string filename(entries.back()->filename);
 				entries.pop_back();
-				cache.erase(filename);
+				cache.remove(filename);
 			}
 		}
 		this->maxSize = maxSize;
 	}
 	
 	/**
-	 * Returns whether <tt>filename</tt> is in the cache.
+	 * Returns whether `filename` is in the cache.
 	 */
-	bool knows(const string &filename) const {
+	bool knows(const StaticString &filename) const {
 		boost::unique_lock<boost::mutex> l(lock);
-		return cache.find(filename) != cache.end();
+		return cache.get(filename) != EntryList::iterator();
 	}
 };