Fix race conditions and deadlocks in Channels (hopefully) (issue #554)

Also, this is a giant commit because of the official Code Style (tm) was applied.

--HG--
branch : minor

src/modules/thread/sdl/Thread.cpp

@@ -26,65 +26,67 @@ namespace thread
 {
 namespace sdl
 {
-	Thread::Thread(Threadable *t)
-		: t(t), running(false), thread(0)
-	{
-	}
+Thread::Thread(Threadable *t)
+	: t(t)
+	, running(false)
+	, thread(0)
+{
+}
 
-	Thread::~Thread()
-	{
-		if (!running) // Clean up handle
-			wait();
-		/*
-		if (running)
-			wait();
-		FIXME: Needed for proper thread cleanup
-		*/
-	}
+Thread::~Thread()
+{
+	if (!running) // Clean up handle
+		wait();
+	/*
+	if (running)
+		wait();
+	FIXME: Needed for proper thread cleanup
+	*/
+}
 
-	bool Thread::start()
-	{
-		Lock l(mutex);
-		if (running)
-			return false;
-		if (thread) // Clean old handle up
-			SDL_WaitThread(thread, 0);
-		thread = SDL_CreateThread(thread_runner, this);
-		running = (thread != 0);
-		return running;
-	}
-
-	void Thread::wait()
-	{
-		mutex.lock();
-		if (!thread)
-			return;
-		mutex.unlock();
+bool Thread::start()
+{
+	Lock l(mutex);
+	if (running)
+		return false;
+	if (thread) // Clean old handle up
 		SDL_WaitThread(thread, 0);
-		Lock l(mutex);
-		running = false;
-		thread = 0;
-	}
+	thread = SDL_CreateThread(thread_runner, this);
+	running = (thread != 0);
+	return running;
+}
 
-	void Thread::kill()
-	{
-		Lock l(mutex);
-		if (!running)
-			return;
-		SDL_KillThread(thread);
-		SDL_WaitThread(thread, 0);
-		running = false;
-		thread = 0;
-	}
+void Thread::wait()
+{
+	mutex.lock();
+	if (!thread)
+		return;
+	mutex.unlock();
+	SDL_WaitThread(thread, 0);
+	Lock l(mutex);
+	running = false;
+	thread = 0;
+}
 
-	int Thread::thread_runner(void *data)
-	{
-		Thread *self = (Thread*) data; // some compilers don't like 'this'
-		self->t->threadFunction();
-		Lock l(self->mutex);
-		self->running = false;
-		return 0;
-	}
+void Thread::kill()
+{
+	Lock l(mutex);
+	if (!running)
+		return;
+	SDL_KillThread(thread);
+	SDL_WaitThread(thread, 0);
+	running = false;
+	thread = 0;
+}
+
+int Thread::thread_runner(void *data)
+{
+	Thread *self = (Thread *) data; // some compilers don't like 'this'
+	self->t->threadFunction();
+	Lock l(self->mutex);
+	self->running = false;
+	return 0;
+}
 } // sdl
 } // thread
 } // love

src/modules/thread/sdl/Thread.h

@@ -34,22 +34,22 @@ namespace thread
 {
 namespace sdl
 {
-	class Thread : public thread::Thread
-	{
-	private:
-		Threadable *t;
-		bool running;
-		SDL_Thread *thread;
-		static int thread_runner(void *data);
-		Mutex mutex;
+class Thread : public thread::Thread
+{
+private:
+	Threadable *t;
+	bool running;
+	SDL_Thread *thread;
+	static int thread_runner(void *data);
+	Mutex mutex;
 
-	public:
-		Thread(Threadable *t);
-		~Thread();
-		bool start();
-		void kill();
-		void wait();
-	}; // Thread
+public:
+	Thread(Threadable *t);
+	~Thread();
+	bool start();
+	void kill();
+	void wait();
+}; // Thread
 } // sdl
 } // thread
 } // love

src/modules/thread/sdl/threads.cpp

@@ -72,7 +72,7 @@ bool Conditional::wait(thread::Mutex *_mutex, int timeout)
 	// Yes, I realise this can be dangerous,
 	// however, you're asking for it if you're
 	// mixing thread implementations.
-	Mutex *mutex = (Mutex*) _mutex;
+	Mutex *mutex = (Mutex *) _mutex;
 	if (timeout < 0)
 		return !SDL_CondWait(cond, mutex->mutex);
 	else

src/modules/thread/sdl/threads.h

@@ -32,37 +32,37 @@ namespace thread
 {
 namespace sdl
 {
-	class Conditional;
+class Conditional;
 
-	class Mutex : public thread::Mutex
-	{
-	public:
-		Mutex();
-		~Mutex();
+class Mutex : public thread::Mutex
+{
+public:
+	Mutex();
+	~Mutex();
 
-		void lock();
-		void unlock();
+	void lock();
+	void unlock();
 
-	private:
-		SDL_mutex* mutex;
-		Mutex(const Mutex&/* mutex*/) {}
+private:
+	SDL_mutex *mutex;
+	Mutex(const Mutex&/* mutex*/) {}
 
-		friend class Conditional;
-	};
+	friend class Conditional;
+};
 
-	class Conditional : public thread::Conditional
-	{
-	public:
-		Conditional();
-		~Conditional();
+class Conditional : public thread::Conditional
+{
+public:
+	Conditional();
+	~Conditional();
 
-		void signal();
-		void broadcast();
-		bool wait(thread::Mutex* mutex, int timeout=-1);
+	void signal();
+	void broadcast();
+	bool wait(thread::Mutex *mutex, int timeout=-1);
 
-	private:
-		SDL_cond* cond;
-	};
+private:
+	SDL_cond *cond;
+};
 
 } // sdl
 } // thread