godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
platform/android/thread_jandroid.cpp
View File

@@ -36,29 +36,29 @@ Thread::ID ThreadAndroid::get_ID() const {
return id;
}
Thread* ThreadAndroid::create_thread_jandroid() {
Thread *ThreadAndroid::create_thread_jandroid() {
return memnew( ThreadAndroid );
return memnew(ThreadAndroid);
}
void *ThreadAndroid::thread_callback(void *userdata) {
ThreadAndroid *t=reinterpret_cast<ThreadAndroid*>(userdata);
ThreadAndroid *t = reinterpret_cast<ThreadAndroid *>(userdata);
setup_thread();
ScriptServer::thread_enter(); //scripts may need to attach a stack
t->id=(ID)pthread_self();
t->id = (ID)pthread_self();
t->callback(t->user);
ScriptServer::thread_exit();
return NULL;
}
Thread* ThreadAndroid::create_func_jandroid(ThreadCreateCallback p_callback,void *p_user,const Settings&) {
Thread *ThreadAndroid::create_func_jandroid(ThreadCreateCallback p_callback, void *p_user, const Settings &) {
ThreadAndroid *tr= memnew(ThreadAndroid);
tr->callback=p_callback;
tr->user=p_user;
ThreadAndroid *tr = memnew(ThreadAndroid);
tr->callback = p_callback;
tr->user = p_user;
pthread_attr_init(&tr->pthread_attr);
pthread_attr_setdetachstate(&tr->pthread_attr, PTHREAD_CREATE_JOINABLE);
pthread_attr_setdetachstate(&tr->pthread_attr, PTHREAD_CREATE_JOINABLE);
pthread_create(&tr->pthread, &tr->pthread_attr, thread_callback, tr);
@@ -70,29 +70,28 @@ Thread::ID ThreadAndroid::get_thread_ID_func_jandroid() {
return (ID)pthread_self();
}
void ThreadAndroid::wait_to_finish_func_jandroid(Thread* p_thread) {
void ThreadAndroid::wait_to_finish_func_jandroid(Thread *p_thread) {
ThreadAndroid *tp=static_cast<ThreadAndroid*>(p_thread);
ThreadAndroid *tp = static_cast<ThreadAndroid *>(p_thread);
ERR_FAIL_COND(!tp);
ERR_FAIL_COND(tp->pthread==0);
ERR_FAIL_COND(tp->pthread == 0);
pthread_join(tp->pthread,NULL);
tp->pthread=0;
pthread_join(tp->pthread, NULL);
tp->pthread = 0;
}
void ThreadAndroid::_thread_destroyed(void* value) {
void ThreadAndroid::_thread_destroyed(void *value) {
/* The thread is being destroyed, detach it from the Java VM and set the mThreadKey value to NULL as required */
JNIEnv *env = (JNIEnv*) value;
JNIEnv *env = (JNIEnv *)value;
if (env != NULL) {
java_vm->DetachCurrentThread();
pthread_setspecific(jvm_key, NULL);
}
}
pthread_key_t ThreadAndroid::jvm_key;
JavaVM* ThreadAndroid::java_vm=NULL;
JavaVM *ThreadAndroid::java_vm = NULL;
void ThreadAndroid::setup_thread() {
@@ -100,19 +99,17 @@ void ThreadAndroid::setup_thread() {
return; //already setup
JNIEnv *env;
java_vm->AttachCurrentThread(&env, NULL);
pthread_setspecific(jvm_key, (void*) env);
pthread_setspecific(jvm_key, (void *)env);
}
void ThreadAndroid::make_default(JavaVM* p_java_vm) {
void ThreadAndroid::make_default(JavaVM *p_java_vm) {
java_vm=p_java_vm;
create_func=create_func_jandroid;
get_thread_ID_func=get_thread_ID_func_jandroid;
wait_to_finish_func=wait_to_finish_func_jandroid;
java_vm = p_java_vm;
create_func = create_func_jandroid;
get_thread_ID_func = get_thread_ID_func_jandroid;
wait_to_finish_func = wait_to_finish_func_jandroid;
pthread_key_create(&jvm_key, _thread_destroyed);
setup_thread();
}
JNIEnv *ThreadAndroid::get_env() {
@@ -121,20 +118,15 @@ JNIEnv *ThreadAndroid::get_env() {
setup_thread();
}
JNIEnv *env=NULL;
JNIEnv *env = NULL;
int status = java_vm->AttachCurrentThread(&env, NULL);
return env;
}
ThreadAndroid::ThreadAndroid() {
pthread=0;
pthread = 0;
}
ThreadAndroid::~ThreadAndroid() {
}