godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only cleanup meta data if GDNative library is reloadable and we're about to unload it

Browse Source 
(cherry picked from commit 81131bd844)
This commit is contained in:
Bastiaan Olij 2021-04-06 11:55:15 +10:00 committed by Rémi Verschelde
parent 48b7e73e44
commit 5228871e26
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
modules/gdnative/nativescript/nativescript.cpp
View File

@ -1502,44 +1502,48 @@ void NativeScriptLanguage::unregister_script(NativeScript *script) {
if (S->get().size() == 0) { if (S->get().size() == 0) {
library_script_users.erase(S); library_script_users.erase(S);
Map<String, Map<StringName, NativeScriptDesc> >::Element *L = library_classes.find(script->lib_path);
if (L) {
Map<StringName, NativeScriptDesc> classes = L->get();
for (Map<StringName, NativeScriptDesc>::Element *C = classes.front(); C; C = C->next()) {
// free property stuff first
for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element P = C->get().properties.front(); P; P = P.next()) {
if (P.get().getter.free_func) {
P.get().getter.free_func(P.get().getter.method_data);
}
if (P.get().setter.free_func) {
P.get().setter.free_func(P.get().setter.method_data);
}
}
// free method stuff
for (Map<StringName, NativeScriptDesc::Method>::Element *M = C->get().methods.front(); M; M = M->next()) {
if (M->get().method.free_func) {
M->get().method.free_func(M->get().method.method_data);
}
}
// free constructor/destructor
if (C->get().create_func.free_func) {
C->get().create_func.free_func(C->get().create_func.method_data);
}
if (C->get().destroy_func.free_func) {
C->get().destroy_func.free_func(C->get().destroy_func.method_data);
}
}
library_classes.erase(script->lib_path);
}
Map<String, Ref<GDNative> >::Element *G = library_gdnatives.find(script->lib_path); Map<String, Ref<GDNative> >::Element *G = library_gdnatives.find(script->lib_path);
if (G && G->get()->get_library()->is_reloadable()) { if (G && G->get()->get_library()->is_reloadable()) {
// ONLY if the library is marked as reloadable, and no more instances of its scripts exist do we unload the library
// First remove meta data related to the library
Map<String, Map<StringName, NativeScriptDesc> >::Element *L = library_classes.find(script->lib_path);
if (L) {
Map<StringName, NativeScriptDesc> classes = L->get();
for (Map<StringName, NativeScriptDesc>::Element *C = classes.front(); C; C = C->next()) {
// free property stuff first
for (OrderedHashMap<StringName, NativeScriptDesc::Property>::Element P = C->get().properties.front(); P; P = P.next()) {
if (P.get().getter.free_func) {
P.get().getter.free_func(P.get().getter.method_data);
}
if (P.get().setter.free_func) {
P.get().setter.free_func(P.get().setter.method_data);
}
}
// free method stuff
for (Map<StringName, NativeScriptDesc::Method>::Element *M = C->get().methods.front(); M; M = M->next()) {
if (M->get().method.free_func) {
M->get().method.free_func(M->get().method.method_data);
}
}
// free constructor/destructor
if (C->get().create_func.free_func) {
C->get().create_func.free_func(C->get().create_func.method_data);
}
if (C->get().destroy_func.free_func) {
C->get().destroy_func.free_func(C->get().destroy_func.method_data);
}
}
library_classes.erase(script->lib_path);
}
// now unload the library
G->get()->terminate(); G->get()->terminate();
library_gdnatives.erase(G); library_gdnatives.erase(G);
} }