passenger 6.0.23 → 6.0.24

data/src/agent/Core/ApplicationPool/Group/Miscellaneous.cpp

@@ -23,6 +23,13 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -65,3 +72,5 @@ Group::authorizeByApiKey(const ApiKey &key) const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_MISCELLANEOUS_CPP_

data/src/agent/Core/ApplicationPool/Group/OutOfBandWork.cpp

@@ -23,6 +23,13 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 #include <IOTools/MessageSerialization.h>
 
@@ -322,3 +329,5 @@ Group::requestOOBW(const ProcessPtr &process) {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_OUT_OF_BAND_WORK_CPP_

data/src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp

@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -57,72 +63,75 @@ Group::findProcessWithStickySessionId(unsigned int id) const {
 	return NULL;
 }
 
+/**
+ * Return the process with the given sticky session ID if it exists.
+ * If not, then find the "best" enabled process to route a request to,
+ * according to the same criteria documented for findBestProcess().
+ *
+ * - If the process with the given sticky session ID exists, then always
+ *   returns that process. Meaning that this process could be `!canBeRoutedTo()`.
+ * - If there is no process that can be routed to, then returns nullptr.
+ */
 Process *
-Group::findProcessWithStickySessionIdOrLowestBusyness(unsigned int id) const {
-	int leastBusyProcessIndex = -1;
-	int lowestBusyness = 0;
-	unsigned int i, size = enabledProcessBusynessLevels.size();
-	const int *enabledProcessBusynessLevels = &this->enabledProcessBusynessLevels[0];
-
-	for (i = 0; i < size; i++) {
-		Process *process = enabledProcesses[i].get();
+Group::findBestProcessPreferringStickySessionId(unsigned int id) const {
+	Process *bestProcess = nullptr;
+	ProcessList::const_iterator it;
+	ProcessList::const_iterator end = enabledProcesses.end();
+
+	for (it = enabledProcesses.begin(); it != end; it++) {
+		Process *process = it->get();
 		if (process->getStickySessionId() == id) {
 			return process;
-		} else if (leastBusyProcessIndex == -1 || enabledProcessBusynessLevels[i] < lowestBusyness) {
-			leastBusyProcessIndex = i;
-			lowestBusyness = enabledProcessBusynessLevels[i];
+		} else if (!process->isTotallyBusy()
+			&& (
+				bestProcess == nullptr
+				|| process->generation > bestProcess->generation
+				|| (process->generation == bestProcess->generation && process->spawnStartTime < bestProcess->spawnStartTime)
+				|| (process->generation == bestProcess->generation && process->spawnStartTime == bestProcess->spawnStartTime && process->busyness() < bestProcess->busyness())
+			)
+		) {
+			bestProcess = process;
 		}
 	}
 
-	if (leastBusyProcessIndex == -1) {
-		return NULL;
-	} else {
-		return enabledProcesses[leastBusyProcessIndex].get();
-	}
+	return bestProcess;
 }
 
+/**
+ * Given a ProcessList, find the "best" process to route a request to.
+ * At the moment, "best" is defined as the process with the highest generation,
+ * lowest start time, and lowest busyness, in that order of priority.
+ *
+ * If there is no process that can be routed to, then returns nullptr.
+ *
+ * @post result != nullptr || result.canBeRoutedTo()
+ */
 Process *
-Group::findProcessWithLowestBusyness(const ProcessList &processes) const {
+Group::findBestProcess(const ProcessList &processes) const {
 	if (processes.empty()) {
-		return NULL;
+		return nullptr;
 	}
 
-	int lowestBusyness = -1;
-	Process *leastBusyProcess = NULL;
+	Process *bestProcess = nullptr;
 	ProcessList::const_iterator it;
 	ProcessList::const_iterator end = processes.end();
-	for (it = processes.begin(); it != end; it++) {
-		Process *process = (*it).get();
-		int busyness = process->busyness();
-		if (lowestBusyness == -1 || lowestBusyness > busyness) {
-			lowestBusyness = busyness;
-			leastBusyProcess = process;
-		}
-	}
-	return leastBusyProcess;
-}
 
-/**
- * Cache-optimized version of findProcessWithLowestBusyness() for the common case.
- */
-Process *
-Group::findEnabledProcessWithLowestBusyness() const {
-	if (enabledProcesses.empty()) {
-		return NULL;
-	}
-
-	int leastBusyProcessIndex = -1;
-	int lowestBusyness = 0;
-	unsigned int i, size = enabledProcessBusynessLevels.size();
-	const int *enabledProcessBusynessLevels = &this->enabledProcessBusynessLevels[0];
+	for (it = processes.begin(); it != end; it++) {
+		Process *process = it->get();
 
-	for (i = 0; i < size; i++) {
-		if (leastBusyProcessIndex == -1 || enabledProcessBusynessLevels[i] < lowestBusyness) {
-			leastBusyProcessIndex = i;
-			lowestBusyness = enabledProcessBusynessLevels[i];
+		if (!process->isTotallyBusy()
+			&& (
+				bestProcess == nullptr
+				|| process->generation > bestProcess->generation
+				|| (process->generation == bestProcess->generation && process->spawnStartTime < bestProcess->spawnStartTime)
+				|| (process->generation == bestProcess->generation && process->spawnStartTime == bestProcess->spawnStartTime && process->busyness() < bestProcess->busyness())
+			)
+		) {
+			bestProcess = process;
 		}
 	}
-	return enabledProcesses[leastBusyProcessIndex].get();
+
+	return bestProcess;
 }
 
 /**
@@ -222,6 +231,7 @@ void
 Group::removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result,
 	boost::container::vector<Callback> &postLockActions)
 {
+	const deque<DisableWaiter> &disableWaitlist = this->disableWaitlist;
 	deque<DisableWaiter>::const_iterator it, end = disableWaitlist.end();
 	deque<DisableWaiter> newList;
 	for (it = disableWaitlist.begin(); it != end; it++) {
@@ -233,7 +243,7 @@ Group::removeFromDisableWaitlist(const ProcessPtr &p, DisableResult result,
 			newList.push_back(waiter);
 		}
 	}
-	disableWaitlist = newList;
+	this->disableWaitlist = newList;
 }
 
 void
@@ -428,6 +438,7 @@ Group::attach(const ProcessPtr &process,
 	/* Now that there are enough resources, relevant processes in
 	 * 'disableWaitlist' can be disabled.
 	 */
+	const deque<DisableWaiter> &disableWaitlist = this->disableWaitlist;
 	deque<DisableWaiter>::const_iterator it, end = disableWaitlist.end();
 	deque<DisableWaiter> newDisableWaitlist;
 	for (it = disableWaitlist.begin(); it != end; it++) {
@@ -451,7 +462,7 @@ Group::attach(const ProcessPtr &process,
 			newDisableWaitlist.push_back(waiter);
 		}
 	}
-	disableWaitlist = newDisableWaitlist;
+	this->disableWaitlist = newDisableWaitlist;
 
 	// Update GC sleep timer.
 	wakeUpGarbageCollector();
@@ -616,3 +627,5 @@ Group::disable(const ProcessPtr &process, const DisableCallback &callback) {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_PROCESS_LIST_MANAGEMENT_CPP_

data/src/agent/Core/ApplicationPool/Group/SessionManagement.cpp

@@ -23,7 +23,14 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_SESSION_MANAGEMENT_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_SESSION_MANAGEMENT_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
+#include <cassert>
 
 /*************************************************************************
  *
@@ -58,16 +65,17 @@ Group::RouteResult
 Group::route(const Options &options) const {
 	if (OXT_LIKELY(enabledCount > 0)) {
 		if (options.stickySessionId == 0) {
-			Process *process = findEnabledProcessWithLowestBusyness();
-			if (process->canBeRoutedTo()) {
+			Process *process = findBestProcess(enabledProcesses);
+			if (process != nullptr) {
+				assert(process->canBeRoutedTo());
 				return RouteResult(process);
 			} else {
 				return RouteResult(NULL, true);
 			}
 		} else {
-			Process *process = findProcessWithStickySessionIdOrLowestBusyness(
+			Process *process = findBestProcessPreferringStickySessionId(
 				options.stickySessionId);
-			if (process != NULL) {
+			if (process != nullptr) {
 				if (process->canBeRoutedTo()) {
 					return RouteResult(process);
 				} else {
@@ -78,8 +86,9 @@ Group::route(const Options &options) const {
 			}
 		}
 	} else {
-		Process *process = findProcessWithLowestBusyness(disablingProcesses);
-		if (process->canBeRoutedTo()) {
+		Process *process = findBestProcess(disablingProcesses);
+		if (process != nullptr) {
+			assert(process->canBeRoutedTo());
 			return RouteResult(process);
 		} else {
 			return RouteResult(NULL, true);
@@ -304,9 +313,8 @@ Group::get(const Options &newOptions, const GetCallback &callback,
 		assert(m_spawning || restarting() || poolAtFullCapacity());
 
 		if (disablingCount > 0 && !restarting()) {
-			Process *process = findProcessWithLowestBusyness(disablingProcesses);
-			assert(process != NULL);
-			if (!process->isTotallyBusy()) {
+			Process *process = findBestProcess(disablingProcesses);
+			if (process != nullptr && !process->isTotallyBusy()) {
 				return newSession(process, newOptions.currentTime);
 			}
 		}
@@ -336,3 +344,5 @@ Group::get(const Options &newOptions, const GetCallback &callback,
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_SESSION_MANAGEMENT_CPP_

data/src/agent/Core/ApplicationPool/Group/SpawningAndRestarting.cpp

@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -485,3 +491,5 @@ Group::allowSpawn() const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_SPAWNING_AND_RESTARTING_CPP_

data/src/agent/Core/ApplicationPool/Group/StateInspection.cpp

@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_STATE_INSPECTION_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_STATE_INSPECTION_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 #include <FileTools/PathManip.h>
 #include <cassert>
@@ -303,3 +309,5 @@ Group::inspectConfigInAdminPanelFormat(Json::Value &result) const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_STATE_INSPECTION_CPP_

data/src/agent/Core/ApplicationPool/Group/Verification.cpp

@@ -23,6 +23,12 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_GROUP_VERIFICATION_CPP_
+#define _PASSENGER_APPLICATION_POOL_GROUP_VERIFICATION_CPP_
+
+#ifdef INTELLISENSE
+	#include <Core/ApplicationPool/Pool.h>
+#endif
 #include <Core/ApplicationPool/Group.h>
 
 /*************************************************************************
@@ -158,3 +164,5 @@ Group::verifyNoRequestsOnGetWaitlistAreRoutable() const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_GROUP_VERIFICATION_CPP_

data/src/agent/Core/ApplicationPool/Group.h

@@ -92,8 +92,18 @@ public:
 	};
 
 	struct RouteResult {
-		Process *process;
-		bool finished;
+		/** The Process to route the request to, or nullptr if no process can be routed to. */
+		Process * const process;
+		/**
+		 * If `process` is nullptr, then `finished` indicates whether another `Group::route()`
+		 * call on a different request *could* succeed, meaning that the caller should continue
+		 * calling `Group::route()` if there are more queued requests that need to be processed.
+		 *
+		 * Usually `finished` is false because all processes are totally busy. But in some cases,
+		 * for example when using sticky sessions, it could be true because other requests can
+		 * potentially be routed to other processes.
+		 */
+		const bool finished;
 
 		RouteResult(Process *p, bool _finished = false)
 			: process(p),
@@ -223,9 +233,9 @@ public:
 	/****** Process list management ******/
 
 	Process *findProcessWithStickySessionId(unsigned int id) const;
-	Process *findProcessWithStickySessionIdOrLowestBusyness(unsigned int id) const;
-	Process *findProcessWithLowestBusyness(const ProcessList &processes) const;
-	Process *findEnabledProcessWithLowestBusyness() const;
+	Process *findBestProcessPreferringStickySessionId(unsigned int id) const;
+	Process *findBestProcess(const ProcessList &processes) const;
+	Process *findBestEnabledProcess() const;
 
 	void addProcessToList(const ProcessPtr &process, ProcessList &destination);
 	void removeProcessFromList(const ProcessPtr &process, ProcessList &source);

data/src/agent/Core/ApplicationPool/Pool/AnalyticsCollection.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_ANALYTICS_COLLECTION_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_ANALYTICS_COLLECTION_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -191,3 +194,5 @@ Pool::realCollectAnalytics() {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_ANALYTICS_COLLECTION_CPP_

data/src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_GARBAGE_COLLECTION_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_GARBAGE_COLLECTION_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -199,3 +202,5 @@ Pool::wakeupGarbageCollector() {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_GARBAGE_COLLECTION_CPP_

data/src/agent/Core/ApplicationPool/Pool/GeneralUtils.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_GENERAL_UTILS_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_GENERAL_UTILS_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -237,3 +240,5 @@ Pool::getRandomGenerator() const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_GENERAL_UTILS_CPP_

data/src/agent/Core/ApplicationPool/Pool/GroupUtils.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_GROUP_UTILS_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_GROUP_UTILS_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -288,3 +291,5 @@ Pool::restartGroupsByAppRoot(const StaticString &appRoot, const RestartOptions &
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_GROUP_UTILS_CPP_

data/src/agent/Core/ApplicationPool/Pool/InitializationAndShutdown.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_INITIALIZATION_AND_SHUTDOWN_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_INITIALIZATION_AND_SHUTDOWN_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -140,3 +143,5 @@ Pool::destroy() {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_INITIALIZATION_AND_SHUTDOWN_CPP_

data/src/agent/Core/ApplicationPool/Pool/Miscellaneous.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_MISCELLANEOUS_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_MISCELLANEOUS_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -250,3 +253,5 @@ Pool::authorizeByUid(uid_t uid, bool lock) const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_MISCELLANEOUS_CPP_

data/src/agent/Core/ApplicationPool/Pool/ProcessUtils.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_PROCESS_UTILS_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_PROCESS_UTILS_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -329,3 +332,5 @@ Pool::disableProcess(const StaticString &gupid) {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_PROCESS_UTILS_CPP_

data/src/agent/Core/ApplicationPool/Pool/StateInspection.cpp

@@ -23,6 +23,9 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
+#ifndef _PASSENGER_APPLICATION_POOL_POOL_STATE_INSPECTION_CPP_
+#define _PASSENGER_APPLICATION_POOL_POOL_STATE_INSPECTION_CPP_
+
 #include <Core/ApplicationPool/Pool.h>
 
 /*************************************************************************
@@ -81,12 +84,17 @@ Pool::inspectProcessList(const InspectOptions &options, stringstream &result,
 
 		 if (process->metrics.isValid()) {
 			snprintf(cpubuf, sizeof(cpubuf), "%d%%", (int) process->metrics.cpu);
+#ifndef __clang__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-truncation"
-			//don't worry about format-truncation here, no one has 9.3PB RAM
+#endif
+			// GCC warns about format-truncation here, but no one has 9.3PB RAM
+			// So we can safely ignore this warning.
 			snprintf(membuf, sizeof(membuf), "%ldM",
 				(unsigned long) (process->metrics.realMemory() / 1024));
+#ifndef __clang__
 #pragma GCC diagnostic pop
+#endif
 		} else {
 			snprintf(cpubuf, sizeof(cpubuf), "0%%");
 			snprintf(membuf, sizeof(membuf), "0M");
@@ -431,3 +439,5 @@ Pool::getGroupCount() const {
 
 } // namespace ApplicationPool2
 } // namespace Passenger
+
+#endif // _PASSENGER_APPLICATION_POOL_POOL_STATE_INSPECTION_CPP_

data/src/agent/Core/ApplicationPool/Pool.h

@@ -28,10 +28,8 @@
 
 #include <string>
 #include <vector>
-#include <algorithm>
 #include <utility>
 #include <sstream>
-#include <iomanip>
 #include <boost/thread.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/shared_ptr.hpp>

data/src/agent/Core/ApplicationPool/Process.h

@@ -28,7 +28,6 @@
 
 #include <string>
 #include <vector>
-#include <algorithm>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/container/vector.hpp>
@@ -54,6 +53,10 @@
 #include <Core/SpawningKit/Result.h>
 #include <Shared/ApplicationPoolApiKey.h>
 
+namespace tut {
+	template<class Data> class test_object;
+}
+
 namespace Passenger {
 namespace ApplicationPool2 {
 
@@ -100,6 +103,9 @@ typedef boost::container::vector<ProcessPtr> ProcessList;
  */
 class Process {
 public:
+	friend class Group;
+	template<class Data> friend class tut::test_object;
+
 	static const unsigned int MAX_SOCKETS_ACCEPTING_HTTP_REQUESTS = 3;
 
 private:
@@ -337,9 +343,14 @@ private:
 	}
 
 	void destroySelf() const {
+		Context *context = getContext();
+		Process *storagePointer = const_cast<Process *>(this);
 		this->~Process();
-		LockGuard l(getContext()->memoryManagementSyncher);
-		getContext()->processObjectPool.free(const_cast<Process *>(this));
+
+		LockGuard l(context->memoryManagementSyncher);
+		// Use `storagePointer` because using `this` after calling the destructor
+		// is undefined behavior.
+		context->processObjectPool.free(storagePointer);
 	}
 
 
@@ -384,6 +395,10 @@ public:
 
 	/** Last time when a session was opened for this Process. */
 	unsigned long long lastUsed;
+    /** Which generation of app processes this one belongs to,
+        inherited from the app group, incremented when a restart
+		is initiated*/
+	const unsigned int generation;
 	/** Number of sessions currently open.
 	 * @invariant session >= 0
 	 */
@@ -446,8 +461,7 @@ public:
 	/** Collected by Pool::collectAnalytics(). */
 	ProcessMetrics metrics;
 
-
-	Process(const BasicGroupInfo *groupInfo, const Json::Value &args)
+	Process(const BasicGroupInfo *groupInfo, const unsigned int gen, const Json::Value &args)
 		: info(this, groupInfo, args),
 		  socketsAcceptingHttpRequestsCount(0),
 		  spawnerCreationTime(getJsonUint64Field(args, "spawner_creation_time")),
@@ -458,6 +472,7 @@ public:
 		  refcount(1),
 		  index(-1),
 		  lastUsed(spawnEndTime),
+		  generation(gen),
 		  sessions(0),
 		  processed(0),
 		  lifeStatus(ALIVE),
@@ -471,7 +486,7 @@ public:
 		indexSocketsAcceptingHttpRequests();
 	}
 
-	Process(const BasicGroupInfo *groupInfo, const SpawningKit::Result &skResult,
+	Process(const BasicGroupInfo *groupInfo, const unsigned int gen, const SpawningKit::Result &skResult,
 		const Json::Value &args)
 		: info(this, groupInfo, skResult),
 		  socketsAcceptingHttpRequestsCount(0),
@@ -483,6 +498,7 @@ public:
 		  refcount(1),
 		  index(-1),
 		  lastUsed(spawnEndTime),
+		  generation(gen),
 		  sessions(0),
 		  processed(0),
 		  lifeStatus(ALIVE),

data/src/agent/Core/ApplicationPool/Session.h

@@ -109,9 +109,14 @@ private:
 	}
 
 	void destroySelf() const {
+		Context *context = this->context;
+		Session *storagePointer = const_cast<Session *>(this);
 		this->~Session();
+
 		LockGuard l(context->memoryManagementSyncher);
-		context->sessionObjectPool.free(const_cast<Session *>(this));
+		// Use `storagePointer` because using `this` after calling the destructor
+		// is undefined behavior.
+		context->sessionObjectPool.free(storagePointer);
 	}
 
 public: