passenger 4.0.48 → 4.0.49

data/ext/oxt/detail/backtrace_enabled.hpp

@@ -48,7 +48,7 @@ struct trace_point {
 	const char *data;
 	unsigned short line;
 	bool m_detached;
-	
+
 	trace_point(const char *function, const char *source, unsigned short line,
 		const char *data = 0);
 	trace_point(const char *function, const char *source, unsigned short line,

data/ext/oxt/detail/context.hpp

@@ -75,7 +75,7 @@ struct thread_local_context {
 		std::vector<trace_point *> backtrace_list;
 		spin_lock backtrace_lock;
 	#endif
-	
+
 	static thread_local_context_ptr make_shared_ptr();
 
 	thread_local_context();

data/ext/oxt/detail/spin_lock_darwin.hpp

@@ -42,12 +42,12 @@ public:
 	class scoped_lock: boost::noncopyable {
 	private:
 		spin_lock &l;
-		
+
 	public:
 		scoped_lock(spin_lock &lock): l(lock) {
 			l.lock();
 		}
-		
+
 		~scoped_lock() {
 			l.unlock();
 		}
@@ -56,11 +56,11 @@ public:
 	spin_lock() {
 		spin = 0;
 	}
-	
+
 	void lock() {
 		OSSpinLockLock(&spin);
 	}
-	
+
 	void unlock() {
 		OSSpinLockUnlock(&spin);
 	}

data/ext/oxt/detail/spin_lock_gcc_x86.hpp

@@ -44,19 +44,19 @@ public:
 	class scoped_lock: boost::noncopyable {
 	private:
 		spin_lock &l;
-		
+
 	public:
 		scoped_lock(spin_lock &lock): l(lock) {
 			l.lock();
 		}
-		
+
 		~scoped_lock() {
 			l.unlock();
 		}
 	};
 
 	spin_lock(): exclusion(0) { }
-	
+
 	/**
 	 * Lock this spin lock.
 	 * @throws boost::thread_resource_error Something went wrong.

data/ext/oxt/detail/spin_lock_pthreads.hpp

@@ -44,12 +44,12 @@ public:
 	class scoped_lock: boost::noncopyable {
 	private:
 		spin_lock &l;
-		
+
 	public:
 		scoped_lock(spin_lock &lock): l(lock) {
 			l.lock();
 		}
-		
+
 		~scoped_lock() {
 			l.unlock();
 		}
@@ -64,14 +64,14 @@ public:
 			throw boost::thread_resource_error(ret, "Cannot initialize a spin lock");
 		}
 	}
-	
+
 	~spin_lock() {
 		int ret;
 		do {
 			ret = pthread_spin_destroy(&spin);
 		} while (ret == EINTR);
 	}
-	
+
 	void lock() {
 		int ret;
 		do {

data/ext/oxt/detail/tracable_exception_disabled.hpp

@@ -56,7 +56,7 @@ public:
 	virtual std::string backtrace() const throw() {
 		return "     (backtrace support disabled during compile time)\n";
 	}
-	
+
 	virtual const char *what() const throw() {
 		return "oxt::tracable_exception";
 	}

data/ext/oxt/dynamic_thread_group.hpp

@@ -56,7 +56,7 @@ class dynamic_thread_group {
 private:
 	struct thread_handle;
 	typedef boost::shared_ptr<thread_handle> thread_handle_ptr;
-	
+
 	/** A container which aggregates a thread object
 	 * as well as the its own iterator in the 'thread_handles'
 	 * member. The latter is used for removing itself from
@@ -66,33 +66,33 @@ private:
 		list<thread_handle_ptr>::iterator iterator;
 		thread *thr;
 		bool removed_from_list;
-		
+
 		thread_handle() {
 			thr = NULL;
 			removed_from_list = false;
 		}
-		
+
 		~thread_handle() {
 			delete thr;
 		}
 	};
-	
+
 	/** A mutex which protects thread_handles and nthreads. */
 	mutable boost::mutex lock;
 	/** The internal list of threads. */
 	list<thread_handle_ptr> thread_handles;
 	/** The number of threads in this thread group. */
 	unsigned int nthreads;
-	
+
 	struct thread_cleanup {
 		dynamic_thread_group *thread_group;
 		thread_handle *handle;
-		
+
 		thread_cleanup(dynamic_thread_group *g, thread_handle *h) {
 			thread_group = g;
 			handle = h;
 		}
-		
+
 		~thread_cleanup() {
 			this_thread::disable_interruption di;
 			this_thread::disable_syscall_interruption dsi;
@@ -103,21 +103,21 @@ private:
 			}
 		}
 	};
-	
+
 	void thread_main(boost::function<void ()> &func, thread_handle *handle) {
 		thread_cleanup c(this, handle);
 		func();
 	}
-	
+
 public:
 	dynamic_thread_group() {
 		nthreads = 0;
 	}
-	
+
 	~dynamic_thread_group() {
 		interrupt_and_join_all();
 	}
-	
+
 	/**
 	 * Create a new thread that belongs to this thread group.
 	 *
@@ -155,7 +155,7 @@ public:
 			(*it)->thr->interrupt();
 		}
 	}
-	
+
 	/**
 	 * Interrupt and join all threads in this group.
 	 *
@@ -175,7 +175,7 @@ public:
 		unsigned int nthreads_copy = nthreads;
 		vector<thread *> threads;
 		unsigned int i = 0;
-		
+
 		// We make a copy so that the handles aren't destroyed prematurely.
 		threads.reserve(nthreads);
 		thread_handles_copy = thread_handles;
@@ -186,11 +186,11 @@ public:
 		}
 		thread_handles.clear();
 		nthreads = 0;
-		
+
 		l.unlock();
 		thread::interrupt_and_join_multiple(&threads[0], nthreads_copy, interruptSyscalls);
 	}
-	
+
 	void join_all() {
 		// See comments from interrupt_and_join_all().
 		boost::unique_lock<boost::mutex> l(lock);
@@ -200,7 +200,7 @@ public:
 		unsigned int nthreads_copy = nthreads;
 		vector<thread *> threads;
 		unsigned int i = 0;
-		
+
 		// We make a copy so that the handles aren't destroyed prematurely.
 		threads.reserve(nthreads);
 		thread_handles_copy = thread_handles;
@@ -211,13 +211,13 @@ public:
 		}
 		thread_handles.clear();
 		nthreads = 0;
-		
+
 		l.unlock();
 		for (i = 0; i < nthreads_copy; i++) {
 			threads[i]->join();
 		}
 	}
-	
+
 	/**
 	 * Returns the number of threads currently in this thread group.
 	 */

data/ext/oxt/implementation.cpp

@@ -58,12 +58,13 @@ static global_context_t *global_context = NULL;
  */
 #ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
 	static __thread thread_local_context_ptr *local_context = NULL;
+	__thread void *thread_signature = NULL;
 
 	static void
 	init_thread_local_context_support() {
 		/* Do nothing. */
 	}
-	
+
 	void
 	set_thread_local_context(const thread_local_context_ptr &ctx) {
 		local_context = new thread_local_context_ptr(ctx);
@@ -93,7 +94,7 @@ static global_context_t *global_context = NULL;
 	 * this object alive until the OS cleans it up.
 	 */
 	static thread_specific_ptr<thread_local_context_ptr> *local_context = NULL;
-	
+
 	static void
 	init_thread_local_context_support() {
 		local_context = new thread_specific_ptr<thread_local_context_ptr>();
@@ -180,7 +181,7 @@ tracable_exception::tracable_exception() {
 	if (OXT_LIKELY(ctx != NULL)) {
 		spin_lock::scoped_lock l(ctx->backtrace_lock);
 		vector<trace_point *>::const_iterator it, end = ctx->backtrace_list.end();
-		
+
 		backtrace_copy.reserve(ctx->backtrace_list.size());
 		for (it = ctx->backtrace_list.begin(); it != end; it++) {
 			trace_point *p = new trace_point(
@@ -232,10 +233,10 @@ format_backtrace(const Collection &backtrace_list) {
 		backtrace_list.rbegin();
 		stringstream result;
 		typename Collection::const_reverse_iterator it;
-		
+
 		for (it = backtrace_list.rbegin(); it != backtrace_list.rend(); it++) {
 			const trace_point *p = *it;
-			
+
 			result << "     in '" << p->function << "'";
 			if (p->source != NULL) {
 				const char *source = strrchr(p->source, '/');
@@ -387,7 +388,7 @@ thread::all_backtraces() throw() {
 			boost::lock_guard<boost::mutex> l(global_context->thread_registration_mutex);
 			list<thread_local_context_ptr>::const_iterator it;
 			std::stringstream result;
-			
+
 			for (it = global_context->registered_threads.begin();
 			     it != global_context->registered_threads.end();
 			     it++)
@@ -399,7 +400,7 @@ thread::all_backtraces() throw() {
 					result << ", LWP " << ctx->tid;
 				#endif
 				result << "):" << endl;
-				
+
 				spin_lock::scoped_lock l(ctx->backtrace_lock);
 				std::string bt = format_backtrace(ctx->backtrace_list);
 				result << bt;
@@ -420,7 +421,7 @@ thread::all_backtraces() throw() {
 void
 thread::interrupt(bool interruptSyscalls) {
 	int ret;
-	
+
 	boost::thread::interrupt();
 	if (interruptSyscalls && context->syscall_interruption_lock.try_lock()) {
 		do {

data/ext/oxt/macros.hpp

@@ -42,7 +42,7 @@
 	 * This allows the CPU to better perform branch prediction.
 	 */
 	#define OXT_LIKELY(expr) __builtin_expect((expr), 1)
-	
+
 	/**
 	 * Indicate that the given expression is likely to be false.
 	 * This allows the CPU to better perform branch prediction.
@@ -92,7 +92,7 @@
  * GCC on OpenBSD supports __thread, but any access to such a variable
  * results in a segfault.
  *
- * Solaris does support __thread, but often it's not compiled into default GCC 
+ * Solaris does support __thread, but often it's not compiled into default GCC
  * packages (not to mention it's not available for Sparc). Playing it safe...
  *
  * On MacOS X, neither gcc nor llvm-gcc support the __thread keyword, but Clang

data/ext/oxt/system_calls.cpp

@@ -48,7 +48,7 @@ oxt::setup_syscall_interruption_support() {
 	struct sigaction action;
 	sigset_t signal_set;
 	int ret;
-	
+
 	/* Very important! The signal mask is inherited across fork()
 	 * and exec() and we don't know what the parent process did to
 	 * us. At least on OS X, having a signal mask blocking important
@@ -58,7 +58,7 @@ oxt::setup_syscall_interruption_support() {
 	do {
 		ret = sigprocmask(SIG_SETMASK, &signal_set, NULL);
 	} while (ret == -1 && errno == EINTR);
-	
+
 	action.sa_handler = interruption_signal_handler;
 	action.sa_flags   = 0;
 	sigemptyset(&action.sa_mask);
@@ -86,7 +86,7 @@ oxt::setup_random_failure_simulation(const ErrorChance *_errorChances, unsigned
 
 static bool
 shouldSimulateFailure() {
-	if (nErrorChances > 0) {
+	if (OXT_UNLIKELY(nErrorChances > 0)) {
 		double number = random() / (double) RAND_MAX;
 		const ErrorChance *candidates[OXT_MAX_ERROR_CHANCES];
 		unsigned int i, n = 0;
@@ -117,12 +117,12 @@ shouldSimulateFailure() {
 
 #define CHECK_INTERRUPTION(error_expression, allowSimulatingFailure, error_assignment, code) \
 	do { \
-		if (allowSimulatingFailure && shouldSimulateFailure()) { \
+		if (OXT_UNLIKELY(allowSimulatingFailure && shouldSimulateFailure())) { \
 			error_assignment; \
 			break; \
 		} \
 		thread_local_context *ctx = get_thread_local_context(); \
-		if (OXT_UNLIKELY(ctx != NULL)) { \
+		if (OXT_LIKELY(ctx != NULL)) { \
 			ctx->syscall_interruption_lock.unlock(); \
 		} \
 		int _my_errno; \
@@ -135,7 +135,7 @@ shouldSimulateFailure() {
 			&& (!this_thread::syscalls_interruptable() \
 			    || !(_intr_requested = this_thread::interruption_requested())) \
 		); \
-		if (OXT_UNLIKELY(ctx != NULL)) { \
+		if (OXT_LIKELY(ctx != NULL)) { \
 			ctx->syscall_interruption_lock.lock(); \
 		} \
 		if ((error_expression) \
@@ -239,7 +239,7 @@ syscalls::close(int fd) {
 		if (shouldSimulateFailure()) {
 			return -1;
 		}
-		
+
 		thread_local_context *ctx = get_thread_local_context();
 		if (OXT_UNLIKELY(ctx != NULL)) {
 			ctx->syscall_interruption_lock.unlock();
@@ -579,7 +579,7 @@ syscalls::sleep(unsigned int seconds) {
 	// enough resolution so it won't trigger the problem.
 	struct timespec spec, rem;
 	int ret;
-	
+
 	spec.tv_sec = seconds;
 	spec.tv_nsec = 0;
 	ret = syscalls::nanosleep(&spec, &rem);
@@ -619,7 +619,7 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 	if (OXT_UNLIKELY(ctx != NULL)) {
 		ctx->syscall_interruption_lock.unlock();
 	}
-	
+
 	do {
 		ret = ::nanosleep(&req2, &rem2);
 		e = errno;
@@ -641,11 +641,11 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 		&& (!this_thread::syscalls_interruptable()
 		    || !(intr_requested = this_thread::interruption_requested()))
 	);
-	
+
 	if (OXT_UNLIKELY(ctx != NULL)) {
 		ctx->syscall_interruption_lock.lock();
 	}
-	
+
 	if (ret == -1
 	 && e == EINTR
 	 && this_thread::syscalls_interruptable()

data/ext/oxt/system_calls.hpp

@@ -115,7 +115,7 @@
 namespace oxt {
 	static const int INTERRUPTION_SIGNAL = SIGUSR1; // SIGUSR2 is reserved by Valgrind...
 	#define OXT_MAX_ERROR_CHANCES 16
-	
+
 	struct ErrorChance {
 		double chance;
 		int errorCode;
@@ -124,7 +124,7 @@ namespace oxt {
 	void setup_syscall_interruption_support();
 
 	void setup_random_failure_simulation(const ErrorChance *errorChances, unsigned int n);
-	
+
 	/**
 	 * System call and C library call wrappers with interruption support.
 	 * These functions are interruption points, i.e. they throw
@@ -144,7 +144,7 @@ namespace oxt {
 		int dup2(int filedes, int filedes2);
 		int mkdir(const char *pathname, mode_t mode);
 		int chown(const char *path, uid_t owner, gid_t group);
-		
+
 		int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
 		int bind(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
 		int connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen);
@@ -156,23 +156,23 @@ namespace oxt {
 		int setsockopt(int s, int level, int optname, const void *optval,
 			socklen_t optlen);
 		int shutdown(int s, int how);
-		
+
 		int select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *errorfds,
 		           struct timeval *timeout);
 		int poll(struct pollfd fds[], nfds_t nfds, int timeout);
-		
+
 		FILE *fopen(const char *path, const char *mode);
 		size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream);
 		int fclose(FILE *fp);
 		int unlink(const char *pathname);
 		int stat(const char *path, struct stat *buf);
 		int lstat(const char *path, struct stat *buf);
-		
+
 		time_t time(time_t *t);
 		unsigned int sleep(unsigned int seconds);
 		int usleep(useconds_t usec);
 		int nanosleep(const struct timespec *req, struct timespec *rem);
-		
+
 		pid_t fork();
 		int kill(pid_t pid, int sig);
 		int killpg(pid_t pgrp, int sig);
@@ -198,7 +198,7 @@ namespace this_thread {
 	 * the calling thread.
 	 */
 	bool syscalls_interruptable();
-	
+
 	class restore_syscall_interruption;
 
 	/**
@@ -223,7 +223,7 @@ namespace this_thread {
 				}
 			#endif
 		}
-		
+
 		~enable_syscall_interruption() {
 			#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
 				_syscalls_interruptable = last_value;
@@ -232,7 +232,7 @@ namespace this_thread {
 			#endif
 		}
 	};
-	
+
 	/**
 	 * Create this struct on the stack to temporarily disable system
 	 * call interruption, until the object goes out of scope.
@@ -258,7 +258,7 @@ namespace this_thread {
 				}
 			#endif
 		}
-		
+
 		~disable_syscall_interruption() {
 			#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
 				_syscalls_interruptable = last_value;
@@ -267,7 +267,7 @@ namespace this_thread {
 			#endif
 		}
 	};
-	
+
 	/**
 	 * Creating an object of this class on the stack will restore the
 	 * system call interruption state to what it was before.
@@ -286,7 +286,7 @@ namespace this_thread {
 				*_syscalls_interruptable = intr.last_value;
 			#endif
 		}
-		
+
 		~restore_syscall_interruption() {
 			#ifdef OXT_THREAD_LOCAL_KEYWORD_SUPPORTED
 				_syscalls_interruptable = last_value;