passenger 4.0.20 → 4.0.21

data/ext/common/ApplicationPool2/Group.h

@@ -60,7 +60,7 @@ using namespace oxt;
  * Except for otherwise documented parts, this class is not thread-safe,
  * so only access within ApplicationPool lock.
  */
-class Group: public enable_shared_from_this<Group> {
+class Group: public boost::enable_shared_from_this<Group> {
 private:
 	friend class Pool;
 	friend class SuperGroup;
@@ -90,7 +90,7 @@ private:
 	 * Groups.
 	 * Read-only; only set during initialization.
 	 */
-	weak_ptr<SuperGroup> superGroup;
+	boost::weak_ptr<SuperGroup> superGroup;
 	CachedFileStat cstat;
 	FileChangeChecker fileChangeChecker;
 	string restartFile;
@@ -150,7 +150,7 @@ private:
 	 * whether any of the Processes can be shut down.
 	 */
 	bool detachedProcessesCheckerActive;
-	condition_variable detachedProcessesCheckerCond;
+	boost::condition_variable detachedProcessesCheckerCond;
 	Callback shutdownCallback;
 	GroupPtr selfPointer;
 	
@@ -329,7 +329,7 @@ private:
 			return true;
 		} else {
 			P_WARN("Request queue is full. Returning an error");
-			callback(SessionPtr(), make_shared<RequestQueueFullException>());
+			callback(SessionPtr(), boost::make_shared<RequestQueueFullException>());
 			return false;
 		}
 	}
@@ -721,14 +721,14 @@ public:
 		}
 		
 		if (OXT_UNLIKELY(newOptions.noop)) {
-			ProcessPtr process = make_shared<Process>(SafeLibevPtr(),
+			ProcessPtr process = boost::make_shared<Process>(SafeLibevPtr(),
 				0, string(), string(),
 				FileDescriptor(), FileDescriptor(),
 				SocketListPtr(), 0, 0);
 			process->dummy = true;
 			process->requiresShutdown = false;
 			process->setGroup(shared_from_this());
-			return make_shared<Session>(process, (Socket *) NULL);
+			return boost::make_shared<Session>(process, (Socket *) NULL);
 		}
 		
 		if (OXT_UNLIKELY(enabledCount == 0)) {

data/ext/common/ApplicationPool2/Implementation.cpp

@@ -46,7 +46,7 @@ using namespace oxt;
 	do { \
 		const klass *ep = dynamic_cast<const klass *>(&e); \
 		if (ep != NULL) { \
-			return make_shared<klass>(*ep); \
+			return boost::make_shared<klass>(*ep); \
 		} \
 	} while (false)
 
@@ -81,7 +81,7 @@ copyException(const tracable_exception &e) {
 
 	TRY_COPY_EXCEPTION(boost::thread_interrupted);
 
-	return make_shared<tracable_exception>(e);
+	return boost::make_shared<tracable_exception>(e);
 }
 
 #define TRY_RETHROW_EXCEPTION(klass) \
@@ -157,7 +157,7 @@ SuperGroup::generateSecret() const {
 }
 
 void
-SuperGroup::createInterruptableThread(const function<void ()> &func, const string &name,
+SuperGroup::createInterruptableThread(const boost::function<void ()> &func, const string &name,
 	unsigned int stackSize)
 {
 	getPool()->interruptableThreads.create_thread(func, name, stackSize);
@@ -179,7 +179,7 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 		string message = "The directory " +
 			options.appRoot +
 			" does not seem to contain a web application.";
-		exception = make_shared<SpawnException>(
+		exception = boost::make_shared<SpawnException>(
 			message, message, false);
 	}
 	
@@ -193,7 +193,7 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 			debug->messages->recv("Proceed with initializing SuperGroup");
 		}
 
-		unique_lock<boost::mutex> lock(getPoolSyncher(pool));
+		boost::unique_lock<boost::mutex> lock(getPoolSyncher(pool));
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		NOT_EXPECTING_EXCEPTIONS();
@@ -221,7 +221,7 @@ SuperGroup::realDoInitialize(const Options &options, unsigned int generation) {
 		} else {
 			for (it = componentInfos.begin(); it != componentInfos.end(); it++) {
 				const ComponentInfo &info = *it;
-				GroupPtr group = make_shared<Group>(shared_from_this(),
+				GroupPtr group = boost::make_shared<Group>(shared_from_this(),
 					options, info);
 				groups.push_back(group);
 				if (info.isDefault) {
@@ -254,7 +254,7 @@ SuperGroup::realDoRestart(const Options &options, unsigned int generation) {
 		debug->messages->recv("Proceed with restarting SuperGroup");
 	}
 	
-	unique_lock<boost::mutex> lock(getPoolSyncher(pool));
+	boost::unique_lock<boost::mutex> lock(getPoolSyncher(pool));
 	if (OXT_UNLIKELY(this->generation != generation)) {
 		return;
 	}
@@ -284,7 +284,7 @@ SuperGroup::realDoRestart(const Options &options, unsigned int generation) {
 		} else {
 			// This is not an existing group but a new one,
 			// so create it.
-			group = make_shared<Group>(shared_from_this(),
+			group = boost::make_shared<Group>(shared_from_this(),
 				options, info);
 			newGroups.push_back(group);
 		}
@@ -330,7 +330,7 @@ Group::Group(const SuperGroupPtr &_superGroup, const Options &options, const Com
 	lifeStatus     = ALIVE;
 	if (options.restartDir.empty()) {
 		restartFile = options.appRoot + "/tmp/restart.txt";
-		alwaysRestartFile = options.appRoot + "/always_restart.txt";
+		alwaysRestartFile = options.appRoot + "/tmp/always_restart.txt";
 	} else if (options.restartDir[0] == '/') {
 		restartFile = options.restartDir + "/restart.txt";
 		alwaysRestartFile = options.restartDir + "/always_restart.txt";
@@ -364,7 +364,7 @@ Group::onSessionInitiateFailure(const ProcessPtr &process, Session *session) {
 	TRACE_POINT();
 	// Standard resource management boilerplate stuff...
 	PoolPtr pool = getPool();
-	unique_lock<boost::mutex> lock(pool->syncher);
+	boost::unique_lock<boost::mutex> lock(pool->syncher);
 	assert(process->isAlive());
 	assert(isAlive() || getLifeStatus() == SHUTTING_DOWN);
 
@@ -384,7 +384,7 @@ Group::onSessionClose(const ProcessPtr &process, Session *session) {
 	TRACE_POINT();
 	// Standard resource management boilerplate stuff...
 	PoolPtr pool = getPool();
-	unique_lock<boost::mutex> lock(pool->syncher);
+	boost::unique_lock<boost::mutex> lock(pool->syncher);
 	assert(process->isAlive());
 	assert(isAlive() || getLifeStatus() == SHUTTING_DOWN);
 
@@ -480,7 +480,7 @@ void
 Group::requestOOBW(const ProcessPtr &process) {
 	// Standard resource management boilerplate stuff...
 	PoolPtr pool = getPool();
-	unique_lock<boost::mutex> lock(pool->syncher);
+	boost::unique_lock<boost::mutex> lock(pool->syncher);
 	if (isAlive() && process->isAlive() && process->oobwStatus == Process::OOBW_NOT_ACTIVE) {
 		process->oobwStatus = Process::OOBW_REQUESTED;
 	}
@@ -524,7 +524,7 @@ Group::lockAndMaybeInitiateOobw(const ProcessPtr &process, DisableResult result,
 	
 	// Standard resource management boilerplate stuff...
 	PoolPtr pool = getPool();
-	unique_lock<boost::mutex> lock(pool->syncher);
+	boost::unique_lock<boost::mutex> lock(pool->syncher);
 	if (OXT_UNLIKELY(!process->isAlive() || !isAlive())) {
 		return;
 	}
@@ -625,7 +625,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 	UPDATE_TRACE_POINT();
 	{
 		// Standard resource management boilerplate stuff...
-		unique_lock<boost::mutex> lock(pool->syncher);
+		boost::unique_lock<boost::mutex> lock(pool->syncher);
 		if (OXT_UNLIKELY(!process->isAlive()
 			|| process->enabled == Process::DETACHED
 			|| !isAlive()))
@@ -696,7 +696,7 @@ Group::spawnThreadOOBWRequest(GroupPtr self, ProcessPtr process) {
 	{
 		// Standard resource management boilerplate stuff...
 		PoolPtr pool = getPool();
-		unique_lock<boost::mutex> lock(pool->syncher);
+		boost::unique_lock<boost::mutex> lock(pool->syncher);
 		if (OXT_UNLIKELY(!process->isAlive() || !isAlive())) {
 			return;
 		}
@@ -798,7 +798,7 @@ Group::spawnThreadRealMain(const SpawnerPtr &spawner, const Options &options, un
 
 		UPDATE_TRACE_POINT();
 		ScopeGuard guard(boost::bind(Process::forceTriggerShutdownAndCleanup, process));
-		unique_lock<boost::mutex> lock(pool->syncher);
+		boost::unique_lock<boost::mutex> lock(pool->syncher);
 
 		if (!isAlive()) {
 			if (process != NULL) {
@@ -1006,7 +1006,7 @@ void
 Group::detachedProcessesCheckerMain(GroupPtr self) {
 	TRACE_POINT();
 	PoolPtr pool = getPool();
-	unique_lock<boost::mutex> lock(pool->syncher);
+	boost::unique_lock<boost::mutex> lock(pool->syncher);
 
 	while (true) {
 		assert(detachedProcessesCheckerActive);
@@ -1223,7 +1223,7 @@ PipeWatcher::start() {
 }
 
 void
-PipeWatcher::threadMain(shared_ptr<PipeWatcher> self) {
+PipeWatcher::threadMain(boost::shared_ptr<PipeWatcher> self) {
 	TRACE_POINT();
 	self->threadMain();
 }
@@ -1232,7 +1232,7 @@ void
 PipeWatcher::threadMain() {
 	TRACE_POINT();
 	{
-		unique_lock<boost::mutex> lock(startSyncher);
+		boost::unique_lock<boost::mutex> lock(startSyncher);
 		while (!started) {
 			startCond.wait(lock);
 		}

data/ext/common/ApplicationPool2/PipeWatcher.h

@@ -39,9 +39,9 @@ using namespace boost;
 
 
 /** A PipeWatcher lives until the file descriptor is closed. */
-struct PipeWatcher: public enable_shared_from_this<PipeWatcher> {
+struct PipeWatcher: public boost::enable_shared_from_this<PipeWatcher> {
 	// For unit tests.
-	typedef function<void (const char *data, unsigned int size)> DataCallback;
+	typedef boost::function<void (const char *data, unsigned int size)> DataCallback;
 	static DataCallback onData;
 
 	FileDescriptor fd;
@@ -50,16 +50,16 @@ struct PipeWatcher: public enable_shared_from_this<PipeWatcher> {
 	bool print;
 	bool started;
 	boost::mutex startSyncher;
-	condition_variable startCond;
+	boost::condition_variable startCond;
 
 	PipeWatcher(const FileDescriptor &_fd, const char *name, pid_t pid, bool _print);
 	void initialize();
 	void start();
-	static void threadMain(shared_ptr<PipeWatcher> self);
+	static void threadMain(boost::shared_ptr<PipeWatcher> self);
 	void threadMain();
 };
 
-typedef shared_ptr<PipeWatcher> PipeWatcherPtr;
+typedef boost::shared_ptr<PipeWatcher> PipeWatcherPtr;
 
 
 } // namespace ApplicationPool2

data/ext/common/ApplicationPool2/Pool.h

@@ -66,7 +66,7 @@ using namespace boost;
 using namespace oxt;
 
 
-class Pool: public enable_shared_from_this<Pool> {
+class Pool: public boost::enable_shared_from_this<Pool> {
 public:
 	struct InspectOptions {
 		bool colorize;
@@ -107,8 +107,8 @@ public:
 		unsigned int spawnLoopIteration;
 
 		DebugSupport() {
-			debugger = make_shared<MessageBox>();
-			messages = make_shared<MessageBox>();
+			debugger = boost::make_shared<MessageBox>();
+			messages = boost::make_shared<MessageBox>();
 			restarting = true;
 			spawning   = true;
 			superGroup = false;
@@ -118,7 +118,7 @@ public:
 		}
 	};
 
-	typedef shared_ptr<DebugSupport> DebugSupportPtr;
+	typedef boost::shared_ptr<DebugSupport> DebugSupportPtr;
 
 	SpawnerFactoryPtr spawnerFactory;
 	LoggerFactoryPtr loggerFactory;
@@ -129,7 +129,7 @@ public:
 	unsigned int max;
 	unsigned long long maxIdleTime;
 	
-	condition_variable garbageCollectionCond;
+	boost::condition_variable garbageCollectionCond;
 	
 	/**
 	 * Code can register background threads in one of these dynamic thread groups
@@ -472,7 +472,7 @@ public:
 
 	struct DetachSuperGroupWaitTicket {
 		boost::mutex syncher;
-		condition_variable cond;
+		boost::condition_variable cond;
 		SuperGroup::ShutdownResult result;
 		bool done;
 
@@ -483,7 +483,7 @@ public:
 
 	struct DisableWaitTicket {
 		boost::mutex syncher;
-		condition_variable cond;
+		boost::condition_variable cond;
 		DisableResult result;
 		bool done;
 
@@ -493,7 +493,7 @@ public:
 	};
 
 	static void syncDetachSuperGroupCallback(SuperGroup::ShutdownResult result,
-		shared_ptr<DetachSuperGroupWaitTicket> ticket)
+		boost::shared_ptr<DetachSuperGroupWaitTicket> ticket)
 	{
 		LockGuard l(ticket->syncher);
 		ticket->done = true;
@@ -501,7 +501,7 @@ public:
 		ticket->cond.notify_one();
 	}
 
-	static void waitDetachSuperGroupCallback(shared_ptr<DetachSuperGroupWaitTicket> ticket) {
+	static void waitDetachSuperGroupCallback(boost::shared_ptr<DetachSuperGroupWaitTicket> ticket) {
 		ScopedLock l(ticket->syncher);
 		while (!ticket->done) {
 			ticket->cond.wait(l);
@@ -509,7 +509,7 @@ public:
 	}
 
 	static void syncDisableProcessCallback(const ProcessPtr &process, DisableResult result,
-		shared_ptr<DisableWaitTicket> ticket)
+		boost::shared_ptr<DisableWaitTicket> ticket)
 	{
 		LockGuard l(ticket->syncher);
 		ticket->done = true;
@@ -672,7 +672,7 @@ public:
 		stringstream data;
 	};
 
-	typedef shared_ptr<ProcessAnalyticsLogEntry> ProcessAnalyticsLogEntryPtr;
+	typedef boost::shared_ptr<ProcessAnalyticsLogEntry> ProcessAnalyticsLogEntryPtr;
 
 	static void collectAnalytics(PoolPtr self) {
 		TRACE_POINT();
@@ -782,7 +782,7 @@ public:
 
 					// Log to Union Station.
 					if (group->options.analytics && loggerFactory != NULL) {
-						ProcessAnalyticsLogEntryPtr entry = make_shared<ProcessAnalyticsLogEntry>();
+						ProcessAnalyticsLogEntryPtr entry = boost::make_shared<ProcessAnalyticsLogEntry>();
 						stringstream &xml = entry->data;
 
 						entry->groupName = group->name;
@@ -832,7 +832,7 @@ public:
 	}
 	
 	SuperGroupPtr createSuperGroup(const Options &options) {
-		SuperGroupPtr superGroup = make_shared<SuperGroup>(shared_from_this(),
+		SuperGroupPtr superGroup = boost::make_shared<SuperGroup>(shared_from_this(),
 			options);
 		superGroup->initialize();
 		superGroups.set(options.getAppGroupName(), superGroup);
@@ -867,7 +867,7 @@ public:
 		if (randomGenerator != NULL) {
 			this->randomGenerator = randomGenerator;
 		} else {
-			this->randomGenerator = make_shared<RandomGenerator>();
+			this->randomGenerator = boost::make_shared<RandomGenerator>();
 		}
 		
 		lifeStatus  = ALIVE;
@@ -904,7 +904,7 @@ public:
 
 	void initDebugging() {
 		LockGuard l(syncher);
-		debugSupport = make_shared<DebugSupport>();
+		debugSupport = boost::make_shared<DebugSupport>();
 	}
 
 	void destroy() {
@@ -1019,7 +1019,7 @@ public:
 				 * the missing SuperGroup.
 				 */
 				P_DEBUG("Creating new SuperGroup");
-				superGroup = make_shared<SuperGroup>(shared_from_this(), options);
+				superGroup = boost::make_shared<SuperGroup>(shared_from_this(), options);
 				superGroup->initialize();
 				superGroups.set(options.getAppGroupName(), superGroup);
 				garbageCollectionCond.notify_all();
@@ -1053,7 +1053,7 @@ public:
 		}
 	}
 	
-	// TODO: 'ticket' should be a shared_ptr for interruption-safety.
+	// TODO: 'ticket' should be a boost::shared_ptr for interruption-safety.
 	SessionPtr get(const Options &options, Ticket *ticket) {
 		ticket->session.reset();
 		ticket->exception.reset();
@@ -1236,8 +1236,8 @@ public:
 				verifyExpensiveInvariants();
 				
 				vector<Callback> actions;
-				shared_ptr<DetachSuperGroupWaitTicket> ticket =
-					make_shared<DetachSuperGroupWaitTicket>();
+				boost::shared_ptr<DetachSuperGroupWaitTicket> ticket =
+					boost::make_shared<DetachSuperGroupWaitTicket>();
 				ExceptionPtr exception = copyException(
 					GetAbortedException("The containg SuperGroup was detached."));
 
@@ -1338,8 +1338,8 @@ public:
 		ProcessPtr process = findProcessByGupid(gupid, false);
 		if (process != NULL) {
 			GroupPtr group = process->getGroup();
-			// Must be a shared_ptr to be interruption-safe.
-			shared_ptr<DisableWaitTicket> ticket = make_shared<DisableWaitTicket>();
+			// Must be a boost::shared_ptr to be interruption-safe.
+			boost::shared_ptr<DisableWaitTicket> ticket = boost::make_shared<DisableWaitTicket>();
 			DisableResult result = group->disable(process,
 				boost::bind(syncDisableProcessCallback, _1, _2, ticket));
 			group->verifyInvariants();

data/ext/common/ApplicationPool2/Process.h

@@ -125,7 +125,7 @@ public:
  * This means that a Group outlives all its Processes, a Process outlives all
  * its Sessions, and a Process also outlives the OS process.
  */
-class Process: public enable_shared_from_this<Process> {
+class Process: public boost::enable_shared_from_this<Process> {
 private:
 	friend class Group;
 	
@@ -136,7 +136,7 @@ private:
 	 * Should never be NULL because a Group should outlive all of its Processes.
 	 * Read-only; only set once during initialization.
 	 */
-	weak_ptr<Group> group;
+	boost::weak_ptr<Group> group;
 	
 	/** A subset of 'sockets': all sockets that speak the
 	 * "session" protocol, sorted by socket.utilization(). */
@@ -345,19 +345,19 @@ public:
 	{
 		SpawnerConfigPtr config;
 		if (_config == NULL) {
-			config = make_shared<SpawnerConfig>();
+			config = boost::make_shared<SpawnerConfig>();
 		} else {
 			config = _config;
 		}
 
 		if (_adminSocket != -1) {
-			PipeWatcherPtr watcher = make_shared<PipeWatcher>(_adminSocket,
+			PipeWatcherPtr watcher = boost::make_shared<PipeWatcher>(_adminSocket,
 				"stdout", pid, config->forwardStdout);
 			watcher->initialize();
 			watcher->start();
 		}
 		if (_errorPipe != -1) {
-			PipeWatcherPtr watcher = make_shared<PipeWatcher>(_errorPipe,
+			PipeWatcherPtr watcher = boost::make_shared<PipeWatcher>(_errorPipe,
 				"stderr", pid, config->forwardStderr);
 			watcher->initialize();
 			watcher->start();
@@ -559,7 +559,7 @@ public:
 			this->sessions++;
 			socket->pqHandle = sessionSockets.push(socket, socket->utilization());
 			lastUsed = SystemTime::getUsec();
-			return make_shared<Session>(shared_from_this(), socket);
+			return boost::make_shared<Session>(shared_from_this(), socket);
 		}
 	}