mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
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.
This commit is contained in:
parent
6a1047d8c1
commit
e4bff8be94
77 changed files with 1594 additions and 2046 deletions
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue