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

Disable threads used to check on plugins to load

Browse Source 
The functionality is unavailable on Android (requires export capability) and unnecessarily consumes resources

(cherry picked from commit 3ac6b6a596)
This commit is contained in:
Fredia Huya-Kouadio
2022-08-15 02:30:08 -07:00
committed by Rémi Verschelde
parent a7a8f9c85d
commit ea8fa93809
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/android/export/export_plugin.cpp
View File

@@ -228,6 +228,7 @@ static const char *AAB_ASSETS_DIRECTORY = "res://android/build/assetPacks/instal
static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk' static const int DEFAULT_MIN_SDK_VERSION = 19; // Should match the value in 'platform/android/java/app/config.gradle#minSdk'
static const int DEFAULT_TARGET_SDK_VERSION = 32; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk' static const int DEFAULT_TARGET_SDK_VERSION = 32; // Should match the value in 'platform/android/java/app/config.gradle#targetSdk'
#ifndef ANDROID_ENABLED
void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) { void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
EditorExportPlatformAndroid *ea = (EditorExportPlatformAndroid *)ud; EditorExportPlatformAndroid *ea = (EditorExportPlatformAndroid *)ud;
@@ -259,7 +260,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
} }
} }
#ifndef ANDROID_ENABLED
// Check for devices updates // Check for devices updates
String adb = get_adb_path(); String adb = get_adb_path();
if (FileAccess::exists(adb)) { if (FileAccess::exists(adb)) {
@@ -373,7 +373,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
ea->device_lock.unlock(); ea->device_lock.unlock();
} }
#endif
uint64_t sleep = 300'000; uint64_t sleep = 300'000;
uint64_t wait = 3'000'000; uint64_t wait = 3'000'000;
@@ -386,7 +385,6 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
} }
} }
#ifndef ANDROID_ENABLED
if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) { if (EditorSettings::get_singleton()->get("export/android/shutdown_adb_on_exit")) {
String adb = get_adb_path(); String adb = get_adb_path();
if (!FileAccess::exists(adb)) { if (!FileAccess::exists(adb)) {
@@ -397,8 +395,8 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) {
args.push_back("kill-server"); args.push_back("kill-server");
OS::get_singleton()->execute(adb, args, true); OS::get_singleton()->execute(adb, args, true);
} }
#endif
} }
#endif
String EditorExportPlatformAndroid::get_project_name(const String &p_name) const { String EditorExportPlatformAndroid::get_project_name(const String &p_name) const {
String aname; String aname;
@@ -3438,10 +3436,14 @@ EditorExportPlatformAndroid::EditorExportPlatformAndroid() {
devices_changed.set(); devices_changed.set();
plugins_changed.set(); plugins_changed.set();
#ifndef ANDROID_ENABLED
check_for_changes_thread.start(_check_for_changes_poll_thread, this); check_for_changes_thread.start(_check_for_changes_poll_thread, this);
#endif
} }
EditorExportPlatformAndroid::~EditorExportPlatformAndroid() { EditorExportPlatformAndroid::~EditorExportPlatformAndroid() {
#ifndef ANDROID_ENABLED
quit_request.set(); quit_request.set();
check_for_changes_thread.wait_to_finish(); check_for_changes_thread.wait_to_finish();
#endif
} }

2
platform/android/export/export_plugin.h
View File

@@ -98,10 +98,12 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
Vector<Device> devices; Vector<Device> devices;
SafeFlag devices_changed; SafeFlag devices_changed;
Mutex device_lock; Mutex device_lock;
#ifndef ANDROID_ENABLED
Thread check_for_changes_thread; Thread check_for_changes_thread;
SafeFlag quit_request; SafeFlag quit_request;
static void _check_for_changes_poll_thread(void *ud); static void _check_for_changes_poll_thread(void *ud);
#endif
String get_project_name(const String &p_name) const; String get_project_name(const String &p_name) const;

8
platform/iphone/export/export.cpp
View File

@@ -57,8 +57,10 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
// Plugins // Plugins
SafeFlag plugins_changed; SafeFlag plugins_changed;
#ifndef ANDROID_ENABLED
Thread check_for_changes_thread; Thread check_for_changes_thread;
SafeFlag quit_request; SafeFlag quit_request;
#endif
Mutex plugins_lock; Mutex plugins_lock;
Vector<PluginConfigIOS> plugins; Vector<PluginConfigIOS> plugins;
@@ -141,6 +143,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
return true; return true;
} }
#ifndef ANDROID_ENABLED
static void _check_for_changes_poll_thread(void *ud) { static void _check_for_changes_poll_thread(void *ud) {
EditorExportPlatformIOS *ea = (EditorExportPlatformIOS *)ud; EditorExportPlatformIOS *ea = (EditorExportPlatformIOS *)ud;
@@ -176,6 +179,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
} }
} }
} }
#endif
protected: protected:
virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features); virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features);
@@ -2124,12 +2128,16 @@ EditorExportPlatformIOS::EditorExportPlatformIOS() {
plugins_changed.set(); plugins_changed.set();
#ifndef ANDROID_ENABLED
check_for_changes_thread.start(_check_for_changes_poll_thread, this); check_for_changes_thread.start(_check_for_changes_poll_thread, this);
#endif
} }
EditorExportPlatformIOS::~EditorExportPlatformIOS() { EditorExportPlatformIOS::~EditorExportPlatformIOS() {
#ifndef ANDROID_ENABLED
quit_request.set(); quit_request.set();
check_for_changes_thread.wait_to_finish(); check_for_changes_thread.wait_to_finish();
#endif
} }
void register_iphone_exporter() { void register_iphone_exporter() {