passenger 4.0.48 → 4.0.49

data/ext/common/Utils/FileChangeChecker.h

@@ -59,24 +59,24 @@ private:
 		string filename;
 		time_t lastMtime;
 		time_t lastCtime;
-		
+
 		Entry(const string &filename) {
 			this->filename  = filename;
 			this->lastMtime = 0;
 			this->lastCtime = 0;
 		}
 	};
-	
+
 	typedef boost::shared_ptr<Entry> EntryPtr;
 	typedef list<EntryPtr> EntryList;
 	typedef map<string, EntryList::iterator> EntryMap;
-	
+
 	CachedFileStat cstat;
 	mutable boost::mutex lock;
 	unsigned int maxSize;
 	EntryList entries;
 	EntryMap fileToEntry;
-	
+
 public:
 	/**
 	 * Create a FileChangeChecker object.
@@ -88,7 +88,7 @@ public:
 	{
 		this->maxSize = maxSize;
 	}
-	
+
 	/**
 	 * Checks whether, since the last call to changed() with this filename,
 	 * the file's timestamp has changed or whether the file has been created
@@ -119,7 +119,7 @@ public:
 		struct stat buf;
 		bool result, newEntry = false;
 		int ret;
-		
+
 		if (it == fileToEntry.end()) {
 			// Filename not in file list.
 			// If file list is full, remove the least recently used
@@ -131,7 +131,7 @@ public:
 				entries.pop_back();
 				fileToEntry.erase(filename);
 			}
-			
+
 			// Add to file list as most recently used.
 			entry = EntryPtr(new Entry(filename));
 			entries.push_front(entry);
@@ -140,13 +140,13 @@ public:
 		} else {
 			// Filename is in file list.
 			entry = *it->second;
-			
+
 			// Mark this entry as most recently used.
 			entries.erase(it->second);
 			entries.push_front(entry);
 			fileToEntry[filename] = entries.begin();
 		}
-		
+
 		ret = cstat.stat(filename, &buf, throttleRate);
 		if (newEntry) {
 			// The file's information isn't in the file list.
@@ -194,7 +194,7 @@ public:
 		this->maxSize = maxSize;
 		cstat.setMaxSize(maxSize);
 	}
-	
+
 	/**
 	 * Returns whether <tt>filename</tt> is in the internal file list.
 	 */

data/ext/common/Utils/MemZeroGuard.h

@@ -42,7 +42,7 @@ private:
 	void *data;
 	unsigned int size;
 	string *str;
-	
+
 	static void securelyZeroMemory(volatile void *data, unsigned int size) {
 		/* We do not use memset() here because the compiler may
 		 * optimize out memset() calls. Instead, the following
@@ -54,7 +54,7 @@ private:
 			*p++ = 0;
 		}
 	}
-	
+
 public:
 	/**
 	 * Creates a new MemZeroGuard object with a memory region to zero.
@@ -68,7 +68,7 @@ public:
 		this->size = size;
 		this->str  = NULL;
 	}
-	
+
 	/**
 	 * Creates a new MemoryZeroGuard object with a string to zero.
 	 *
@@ -79,7 +79,7 @@ public:
 		this->size = 0;
 		this->str  = &str;
 	}
-	
+
 	/**
 	 * Zero the data immediately. The data will still be zeroed after
 	 * destruction of this object.
@@ -91,7 +91,7 @@ public:
 			securelyZeroMemory((volatile void *) str->c_str(), str->size());
 		}
 	}
-	
+
 	~MemZeroGuard() {
 		zeroNow();
 	}

data/ext/common/Utils/MemoryBarrier.h

@@ -40,7 +40,7 @@
 			#define P_WRITE_BARRIER() \
 				do { __asm__ __volatile__ ("lock; addl $0,0(%%esp)" ::: "memory"); } while (false)
 		#endif
-		
+
 	#elif defined(__x86_64__)
 		#define P_READ_BARRIER() \
 			do { __asm__ __volatile__ ("lfence" ::: "memory"); } while (false)

data/ext/common/Utils/MessageIO.h

@@ -118,10 +118,10 @@ using namespace boost;
  * @throws boost::thread_interrupted
  */
 inline bool
-readUint16(int fd, uint16_t &output, unsigned long long *timeout = NULL) {
-	uint16_t temp;
-	
-	if (readExact(fd, &temp, sizeof(uint16_t), timeout) == sizeof(uint16_t)) {
+readUint16(int fd, boost::uint16_t &output, unsigned long long *timeout = NULL) {
+	boost::uint16_t temp;
+
+	if (readExact(fd, &temp, sizeof(boost::uint16_t), timeout) == sizeof(boost::uint16_t)) {
 		output = ntohs(temp);
 		return true;
 	} else {
@@ -145,10 +145,10 @@ readUint16(int fd, uint16_t &output, unsigned long long *timeout = NULL) {
  *                          <tt>timeout</tt> microseconds.
  * @throws boost::thread_interrupted
  */
-inline uint16_t
+inline boost::uint16_t
 readUint16(int fd, unsigned long long *timeout = NULL) {
-	uint16_t temp;
-	
+	boost::uint16_t temp;
+
 	if (readUint16(fd, temp, timeout)) {
 		return temp;
 	} else {
@@ -174,10 +174,10 @@ readUint16(int fd, unsigned long long *timeout = NULL) {
  * @throws boost::thread_interrupted
  */
 inline bool
-readUint32(int fd, uint32_t &output, unsigned long long *timeout = NULL) {
-	uint32_t temp;
-	
-	if (readExact(fd, &temp, sizeof(uint32_t), timeout) == sizeof(uint32_t)) {
+readUint32(int fd, boost::uint32_t &output, unsigned long long *timeout = NULL) {
+	boost::uint32_t temp;
+
+	if (readExact(fd, &temp, sizeof(boost::uint32_t), timeout) == sizeof(boost::uint32_t)) {
 		output = ntohl(temp);
 		return true;
 	} else {
@@ -201,10 +201,10 @@ readUint32(int fd, uint32_t &output, unsigned long long *timeout = NULL) {
  *                          <tt>timeout</tt> microseconds.
  * @throws boost::thread_interrupted
  */
-inline uint32_t
+inline boost::uint32_t
 readUint32(int fd, unsigned long long *timeout = NULL) {
-	uint32_t temp;
-	
+	boost::uint32_t temp;
+
 	if (readUint32(fd, temp, timeout)) {
 		return temp;
 	} else {
@@ -235,17 +235,17 @@ readUint32(int fd, unsigned long long *timeout = NULL) {
 template<typename Collection>
 inline bool
 readArrayMessage(int fd, Collection &output, unsigned long long *timeout = NULL) {
-	uint16_t size;
+	boost::uint16_t size;
 	if (!readUint16(fd, size, timeout)) {
 		return false;
 	}
-	
+
 	scoped_array<char> buffer(new char[size]);
 	MemZeroGuard g(buffer.get(), size);
 	if (readExact(fd, buffer.get(), size, timeout) != size) {
 		return false;
 	}
-	
+
 	output.clear();
 	if (size != 0) {
 		string::size_type start = 0, pos;
@@ -278,7 +278,7 @@ readArrayMessage(int fd, Collection &output, unsigned long long *timeout = NULL)
 inline vector<string>
 readArrayMessage(int fd, unsigned long long *timeout = NULL) {
 	vector<string> output;
-	
+
 	if (readArrayMessage(fd, output, timeout)) {
 		return output;
 	} else {
@@ -309,15 +309,15 @@ readArrayMessage(int fd, unsigned long long *timeout = NULL) {
  */
 inline bool
 readScalarMessage(int fd, string &output, unsigned int maxSize = 0, unsigned long long *timeout = NULL) {
-	uint32_t size;
+	boost::uint32_t size;
 	if (!readUint32(fd, size, timeout)) {
 		return false;
 	}
-	
-	if (maxSize != 0 && size > (uint32_t) maxSize) {
+
+	if (maxSize != 0 && size > (boost::uint32_t) maxSize) {
 		throw SecurityException("The scalar message body is larger than the size limit");
 	}
-	
+
 	unsigned int remaining = size;
 	if (OXT_UNLIKELY(!output.empty())) {
 		output.clear();
@@ -326,10 +326,10 @@ readScalarMessage(int fd, string &output, unsigned int maxSize = 0, unsigned lon
 	if (OXT_LIKELY(remaining > 0)) {
 		char buf[1024 * 32];
 		MemZeroGuard g(buf, sizeof(buf));
-		
+
 		while (remaining > 0) {
 			unsigned int blockSize = min((unsigned int) sizeof(buf), remaining);
-			
+
 			if (readExact(fd, buf, blockSize, timeout) != blockSize) {
 				return false;
 			}
@@ -387,9 +387,9 @@ readScalarMessage(int fd, unsigned int maxSize = 0, unsigned long long *timeout
  * @throws boost::thread_interrupted
  */
 inline void
-writeUint16(int fd, uint16_t value, unsigned long long *timeout = NULL) {
-	uint16_t l = htons(value);
-	writeExact(fd, &l, sizeof(uint16_t), timeout);
+writeUint16(int fd, boost::uint16_t value, unsigned long long *timeout = NULL) {
+	boost::uint16_t l = htons(value);
+	writeExact(fd, &l, sizeof(boost::uint16_t), timeout);
 }
 
 /**
@@ -408,9 +408,9 @@ writeUint16(int fd, uint16_t value, unsigned long long *timeout = NULL) {
  * @throws boost::thread_interrupted
  */
 inline void
-writeUint32(int fd, uint32_t value, unsigned long long *timeout = NULL) {
-	uint32_t l = htonl(value);
-	writeExact(fd, &l, sizeof(uint32_t), timeout);
+writeUint32(int fd, boost::uint32_t value, unsigned long long *timeout = NULL) {
+	boost::uint32_t l = htonl(value);
+	writeExact(fd, &l, sizeof(boost::uint32_t), timeout);
 }
 
 
@@ -436,25 +436,25 @@ template<typename Collection>
 inline void
 writeArrayMessageEx(int fd, const Collection &args, unsigned long long *timeout = NULL) {
 	typename Collection::const_iterator it, end = args.end();
-	uint16_t bodySize = 0;
-	
+	boost::uint16_t bodySize = 0;
+
 	for (it = args.begin(); it != end; it++) {
 		bodySize += it->size() + 1;
 	}
-	
-	scoped_array<char> data(new char[sizeof(uint16_t) + bodySize]);
-	uint16_t header = htons(bodySize);
-	memcpy(data.get(), &header, sizeof(uint16_t));
-	
-	char *dataEnd = data.get() + sizeof(uint16_t);
+
+	scoped_array<char> data(new char[sizeof(boost::uint16_t) + bodySize]);
+	boost::uint16_t header = htons(bodySize);
+	memcpy(data.get(), &header, sizeof(boost::uint16_t));
+
+	char *dataEnd = data.get() + sizeof(boost::uint16_t);
 	for (it = args.begin(); it != end; it++) {
 		memcpy(dataEnd, it->data(), it->size());
 		dataEnd += it->size();
 		*dataEnd = '\0';
 		dataEnd++;
 	}
-	
-	writeExact(fd, data.get(), sizeof(uint16_t) + bodySize, timeout);
+
+	writeExact(fd, data.get(), sizeof(boost::uint16_t) + bodySize, timeout);
 }
 
 inline void
@@ -470,25 +470,25 @@ writeArrayMessage(int fd, const vector<string> &args, unsigned long long *timeou
 inline void
 writeArrayMessage(int fd, const StaticString args[], unsigned int nargs, unsigned long long *timeout = NULL) {
 	unsigned int i;
-	uint16_t bodySize = 0;
-	
+	boost::uint16_t bodySize = 0;
+
 	for (i = 0; i < nargs; i++) {
 		bodySize += args[i].size() + 1;
 	}
-	
-	scoped_array<char> data(new char[sizeof(uint16_t) + bodySize]);
-	uint16_t header = htons(bodySize);
-	memcpy(data.get(), &header, sizeof(uint16_t));
-	
-	char *dataEnd = data.get() + sizeof(uint16_t);
+
+	scoped_array<char> data(new char[sizeof(boost::uint16_t) + bodySize]);
+	boost::uint16_t header = htons(bodySize);
+	memcpy(data.get(), &header, sizeof(boost::uint16_t));
+
+	char *dataEnd = data.get() + sizeof(boost::uint16_t);
 	for (i = 0; i < nargs; i++) {
 		memcpy(dataEnd, args[i].data(), args[i].size());
 		dataEnd += args[i].size();
 		*dataEnd = '\0';
 		dataEnd++;
 	}
-	
-	writeExact(fd, data.get(), sizeof(uint16_t) + bodySize, timeout);
+
+	writeExact(fd, data.get(), sizeof(boost::uint16_t) + bodySize, timeout);
 }
 
 inline void
@@ -496,7 +496,7 @@ writeArrayMessageVA(int fd, const StaticString &name, va_list &ap, unsigned long
 	StaticString args[10];
 	unsigned int nargs = 1;
 	bool done = false;
-	
+
 	args[0] = name;
 	do {
 		const char *arg = va_arg(ap, const char *);
@@ -507,14 +507,14 @@ writeArrayMessageVA(int fd, const StaticString &name, va_list &ap, unsigned long
 			nargs++;
 		}
 	} while (!done && nargs < sizeof(args) / sizeof(StaticString));
-	
+
 	if (done) {
 		writeArrayMessage(fd, args, nargs, timeout);
 	} else {
 		// Arguments don't fit in static array. Use dynamic
 		// array instead.
 		vector<StaticString> dyn_args;
-		
+
 		for (unsigned int i = 0; i < nargs; i++) {
 			dyn_args.push_back(args[i]);
 		}
@@ -526,18 +526,18 @@ writeArrayMessageVA(int fd, const StaticString &name, va_list &ap, unsigned long
 				dyn_args.push_back(arg);
 			}
 		} while (!done);
-		
+
 		writeArrayMessage(fd, dyn_args, timeout);
 	}
 }
 
 struct _VaGuard {
 	va_list &ap;
-	
+
 	_VaGuard(va_list &_ap)
 		: ap(_ap)
 		{ }
-	
+
 	~_VaGuard() {
 		va_end(ap);
 	}
@@ -583,9 +583,9 @@ writeArrayMessage(int fd, unsigned long long *timeout, const char *name, ...) {
  */
 inline void
 writeScalarMessage(int fd, const StaticString &data, unsigned long long *timeout = NULL) {
-	uint32_t header = htonl(data.size());
+	boost::uint32_t header = htonl(data.size());
 	StaticString buffers[2] = {
-		StaticString((const char *) &header, sizeof(uint32_t)),
+		StaticString((const char *) &header, sizeof(boost::uint32_t)),
 		data
 	};
 	gatheredWrite(fd, buffers, 2, timeout);
@@ -646,14 +646,14 @@ readFileDescriptorWithNegotiation(int fd, unsigned long long *timeout = NULL) {
 inline void
 writeFileDescriptorWithNegotiation(int fd, int fdToPass, unsigned long long *timeout = NULL) {
 	vector<string> args;
-	
+
 	args = readArrayMessage(fd, timeout);
 	if (args.size() != 1 || args[0] != "pass IO") {
 		throw IOException("FD passing pre-negotiation message expected");
 	}
-	
+
 	writeFileDescriptor(fd, fdToPass, timeout);
-	
+
 	args = readArrayMessage(fd, timeout);
 	if (args.size() != 1 || args[0] != "got IO") {
 		throw IOException("FD passing post-negotiation message expected.");

data/ext/common/Utils/ProcessMetricsCollector.h

@@ -74,7 +74,7 @@ using namespace oxt;
 struct ProcessMetrics {
 	pid_t   pid;
 	pid_t   ppid;
-	uint8_t cpu;
+	boost::uint8_t cpu;
 	/** Resident Set Size, amount of memory in RAM. Does not include swap.
 	 * -1 if not yet known, 0 if completely swapped out.
 	 */
@@ -96,7 +96,7 @@ struct ProcessMetrics {
 	pid_t   processGroupId;
 	uid_t   uid;
 	string  command;
-	
+
 	ProcessMetrics() {
 		pid = (pid_t) -1;
 		rss = -1;
@@ -105,11 +105,11 @@ struct ProcessMetrics {
 		swap = -1;
 		vmsize = -1;
 	}
-	
+
 	bool isValid() const {
 		return pid != (pid_t) -1;
 	}
-	
+
 	/**
 	 * Returns an estimate of the "real" memory usage of a process in KB.
 	 * We don't use the PSS here because that would mean if another
@@ -148,33 +148,33 @@ public:
 	size_t totalMemory(ssize_t &shared) const {
 		const_iterator it, end = this->end();
 		bool pssAndPrivateDirtyAvailable = true;
-		
+
 		for (it = begin(); it != end && pssAndPrivateDirtyAvailable; it++) {
 			const ProcessMetrics &metric = it->second;
 			pssAndPrivateDirtyAvailable = pssAndPrivateDirtyAvailable &&
 				metric.pss != -1 && metric.privateDirty != -1;
 		}
-		
+
 		if (pssAndPrivateDirtyAvailable) {
 			size_t total = 0;
 			size_t priv = 0;
-			
+
 			for (it = begin(); it != end; it++) {
 				const ProcessMetrics &metric = it->second;
 				total += metric.pss;
 				priv += metric.privateDirty;
 			}
-			
+
 			shared = total - priv;
 			return total;
 		} else {
 			size_t total = 0;
-			
+
 			for (it = begin(); it != end; it++) {
 				const ProcessMetrics &metric = it->second;
 				total += metric.realMemory();
 			}
-			
+
 			shared = -1;
 			return total;
 		}
@@ -189,7 +189,7 @@ class ProcessMetricsCollector {
 private:
 	bool canMeasureRealMemory;
 	string psOutput;
-	
+
 	template<typename Collection, typename ConstIterator>
 	ProcessMetricMap parsePsOutput(const string &output, const Collection &allowedPids) const {
 		ProcessMetricMap result;
@@ -207,11 +207,11 @@ private:
 				pids.insert(*it);
 			}
 		#endif
-		
+
 		// Parse each line.
 		while (start != NULL) {
 			ProcessMetrics metrics;
-			
+
 			metrics.pid  = (pid_t) readNextWordAsLongLong(&start);
 			metrics.ppid = (pid_t) readNextWordAsLongLong(&start);
 			metrics.cpu  = readNextWordAsInt(&start);
@@ -230,7 +230,7 @@ private:
 
 			if (pidAllowed) {
 				result[metrics.pid] = metrics;
-				
+
 				start = strchr(start, '\n');
 				if (start != NULL) {
 					// Skip to beginning of next line.
@@ -243,7 +243,7 @@ private:
 		}
 		return result;
 	}
-	
+
 public:
 	ProcessMetricsCollector() {
 		#ifdef __APPLE__
@@ -252,12 +252,12 @@ public:
 			canMeasureRealMemory = fileExists("/proc/self/smaps");
 		#endif
 	}
-	
+
 	/** Mock 'ps' output, used by unit tests. */
 	void setPsOutput(const string &data) {
 		this->psOutput = data;
 	}
-	
+
 	/**
 	 * Collect metrics for the given process IDs. Nonexistant PIDs are not
 	 * included in the result.
@@ -273,12 +273,12 @@ public:
 		if (pids.empty()) {
 			return ProcessMetricMap();
 		}
-		
+
 		ConstIterator it;
 		// The list of PIDs must follow -p without a space.
 		// https://groups.google.com/forum/#!topic/phusion-passenger/WKXy61nJBMA
 		string pidsArg = "-p";
-		
+
 		for (it = pids.begin(); it != pids.end(); it++) {
 			pidsArg.append(toString(*it));
 			pidsArg.append(",");
@@ -296,7 +296,7 @@ public:
 		#else
 			fmtArg.append("pid,ppid,%cpu,rss,vsize,pgid,uid,command");
 		#endif
-		
+
 		const char *command[] = {
 			"ps", fmtArg.c_str(),
 			#ifdef PS_SUPPORTS_MULTIPLE_PIDS
@@ -304,7 +304,7 @@ public:
 			#endif
 			NULL
 		};
-		
+
 		string psOutput = this->psOutput;
 		if (psOutput.empty()) {
 			psOutput = runCommandAndCaptureOutput(command);
@@ -323,11 +323,11 @@ public:
 		}
 		return result;
 	}
-	
+
 	ProcessMetricMap collect(const vector<pid_t> &pids) const {
 		return collect< vector<pid_t>, vector<pid_t>::const_iterator >(pids);
 	}
-	
+
 	/**
 	 * Attempt to measure various parts of a process's memory usage that may
 	 * contribute to insight as to what its "real" memory usage might be.
@@ -337,7 +337,7 @@ public:
 	 *   sharing it.
 	 * - The private dirty RSS.
 	 * - Amount of memory in swap.
-	 * 
+	 *
 	 * At this time only OS X and recent Linux versions (>= 2.6.25) support
 	 * measuring the proportional set size. Usually root privileges are required.
 	 *
@@ -349,35 +349,35 @@ public:
 		#ifdef __APPLE__
 			kern_return_t ret;
 			mach_port_t task;
-			
+
 			swap = -1;
-			
+
 			ret = task_for_pid(mach_task_self(), pid, &task);
 			if (ret != KERN_SUCCESS) {
 				pss = -1;
 				privateDirty = -1;
 				return;
 			}
-			
+
 			mach_vm_address_t addr = 0;
 			int pagesize = getpagesize();
-			
+
 			// In bytes.
 			pss = 0;
 			privateDirty = 0;
-			
+
 			while (true) {
 				mach_vm_address_t size;
 				vm_region_top_info_data_t info;
 				mach_msg_type_number_t count = VM_REGION_TOP_INFO_COUNT;
 				mach_port_t object_name;
-				
+
 				ret = mach_vm_region(task, &addr, &size, VM_REGION_TOP_INFO,
 					(vm_region_info_t) &info, &count, &object_name);
 				if (ret != KERN_SUCCESS) {
 					break;
 				}
-				
+
 				if (info.share_mode == SM_PRIVATE) {
 					// shared_pages_resident here means that region
 					// has shared memory only "shared" between 1 process.
@@ -391,12 +391,12 @@ public:
 				} else if (info.share_mode == SM_SHARED) {
 					pss += info.shared_pages_resident * pagesize / info.ref_count;
 				}
-				
+
 				addr += size;
 			}
-			
+
 			mach_port_deallocate(mach_task_self(), task);
-			
+
 			// Convert result back to KB.
 			pss /= 1024;
 			privateDirty /= 1024;
@@ -404,7 +404,7 @@ public:
 			string smapsFilename = "/proc/";
 			smapsFilename.append(toString(pid));
 			smapsFilename.append("/smaps");
-			
+
 			FILE *f = syscalls::fopen(smapsFilename.c_str(), "r");
 			if (f == NULL) {
 				error:
@@ -413,21 +413,21 @@ public:
 				swap = -1;
 				return;
 			}
-			
+
 			StdioGuard guard(f);
 			bool hasPss = false;
 			bool hasPrivateDirty = false;
 			bool hasSwap = false;
-			
+
 			// In KB.
 			pss = 0;
 			privateDirty = 0;
 			swap = 0;
-			
+
 			while (!feof(f)) {
 				char line[1024 * 4];
 				const char *buf;
-				
+
 				buf = fgets(line, sizeof(line), f);
 				if (buf == NULL) {
 					if (ferror(f)) {
@@ -466,7 +466,7 @@ public:
 					goto error;
 				}
 			}
-			
+
 			if (!hasPss) {
 				pss = -1;
 			}