Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-04 01:52:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[NativeScript] call _init on instance creation

Browse Source 
This also adds basic locking for the set of owners
to avoid threading problems
This commit is contained in:
Karroffel 2017-07-27 09:11:46 +02:00
parent 411f09a512
commit a2795e9531
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/nativescript/nativescript.cpp
View File

@ -203,7 +203,15 @@ ScriptInstance *NativeScript::instance_create(Object *p_this) {
nsi->userdata = script_data->create_func.create_func((godot_object *)p_this, script_data->create_func.method_data); nsi->userdata = script_data->create_func.create_func((godot_object *)p_this, script_data->create_func.method_data);
#endif #endif
#ifndef NO_THREADS
owners_lock->lock();
#endif
instance_owners.insert(p_this); instance_owners.insert(p_this);
#ifndef NO_THREADS
owners_lock->unlock();
#endif
return nsi; return nsi;
} }
@ -393,9 +401,6 @@ Variant NativeScript::_new(const Variant **p_args, int p_argcount, Variant::Call
ref = REF(r); ref = REF(r);
} }
// GDScript does it like this: _create_instance(p_args, p_argcount, owner, r != NULL, r_error);
// TODO(karroffel): support varargs for constructors.
NativeScriptInstance *instance = (NativeScriptInstance *)instance_create(owner); NativeScriptInstance *instance = (NativeScriptInstance *)instance_create(owner);
owner->set_script_instance(instance); owner->set_script_instance(instance);
@ -407,6 +412,24 @@ Variant NativeScript::_new(const Variant **p_args, int p_argcount, Variant::Call
return Variant(); return Variant();
} }
call("_init", p_args, p_argcount, r_error);
if (r_error.error != Variant::CallError::CALL_OK) {
instance->script = Ref<NativeScript>();
instance->owner->set_script_instance(NULL);
#ifndef NO_THREADS
owners_lock->lock();
#endif
instance_owners.erase(owner);
#ifndef NO_THREADS
owners_lock->unlock();
#endif
ERR_FAIL_COND_V(r_error.error != Variant::CallError::CALL_OK, Variant());
}
if (ref.is_valid()) { if (ref.is_valid()) {
return ref; return ref;
} else { } else {
@ -419,11 +442,18 @@ NativeScript::NativeScript() {
library = Ref<GDNative>(); library = Ref<GDNative>();
lib_path = ""; lib_path = "";
class_name = ""; class_name = "";
#ifndef NO_THREADS
owners_lock = Mutex::create();
#endif
} }
// TODO(karroffel): implement this // TODO(karroffel): implement this
NativeScript::~NativeScript() { NativeScript::~NativeScript() {
NSL->unregister_script(this); NSL->unregister_script(this);
#ifndef NO_THREADS
memdelete(owners_lock);
#endif
} }
////// ScriptInstance stuff ////// ScriptInstance stuff
@ -754,7 +784,16 @@ NativeScriptInstance::~NativeScriptInstance() {
script_data->destroy_func.destroy_func((godot_object *)owner, script_data->destroy_func.method_data, userdata); script_data->destroy_func.destroy_func((godot_object *)owner, script_data->destroy_func.method_data, userdata);
if (owner) { if (owner) {
#ifndef NO_THREADS
script->owners_lock->lock();
#endif
script->instance_owners.erase(owner); script->instance_owners.erase(owner);
#ifndef NO_THREADS
script->owners_lock->lock();
#endif
} }
} }

3
modules/nativescript/nativescript.h
View File

@ -106,6 +106,9 @@ class NativeScript : public Script {
String class_name; String class_name;
#ifndef NO_THREADS
Mutex *owners_lock;
#endif
Set<Object *> instance_owners; Set<Object *> instance_owners;
protected: protected: