From e4bff8be94c0db4f94e63ad448d0eeb869ccdbbd Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Tue, 7 Apr 2015 06:13:12 -0400
Subject: Clean up threading

  * Rename everything.
    * Strip J prefix.
    * Change UpperCamelCase functions to lowerCamelCase.
  * Remove global (!) semaphore count mutex on OSX.
  * Remove semaphore count getter (unused, unsafe, depended on internal
    API functions on Windows, and used a hack on OSX).
  * Add `Atomic<type>`.
  * Make `Thread` handle thread names.
  * Add support for C++11 multi-threading.
  * Combine pthread and win32 sources.
  * Remove `ThreadStarted` (unused, unneeded).
  * Move some includes from the headers to the sources.
  * Move all of `Event` into its header (allows inlining with no new includes).
  * Make `Event` use `Semaphore` (except on Windows).
  * Move some porting functions into `Thread`.
  * Integrate logging with `Thread`.
  * Add threading test.
---
 src/porting_android.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/porting_android.cpp')

diff --git a/src/porting_android.cpp b/src/porting_android.cpp
index 6871ce465..06cc929dd 100644
--- a/src/porting_android.cpp
+++ b/src/porting_android.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "porting.h"
 #include "porting_android.h"
+#include "threading/thread.h"
 #include "config.h"
 #include "filesys.h"
 #include "log.h"
@@ -39,30 +40,28 @@ void android_main(android_app *app)
 	int retval = 0;
 	porting::app_global = app;
 
-	porting::setThreadName("MainThread");
+	Thread::setName("MainThread");
 
 	try {
 		app_dummy();
-		char *argv[] = { (char*) "minetest" };
+		char *argv[] = {(char*) "minetest"};
 		main(sizeof(argv) / sizeof(argv[0]), argv);
-		}
-	catch(BaseException e) {
+	} catch (BaseException &e) {
 		std::stringstream msg;
 		msg << "Exception handled by main: " << e.what();
-		const char* message = msg.str().c_str();
+		const char *message = msg.str().c_str();
 		__android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME, "%s", message);
 		errorstream << msg << std::endl;
 		retval = -1;
-	}
-	catch(...) {
+	} catch (...) {
 		__android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME,
-				"Some exception occured");
+				"An unknown exception occured!");
 		errorstream << "Uncaught exception in main thread!" << std::endl;
 		retval = -1;
 	}
 
 	porting::cleanupAndroid();
-	errorstream << "Shutting down minetest." << std::endl;
+	errorstream << "Shutting down." << std::endl;
 	exit(retval);
 }
 
-- 
cgit v1.2.3