mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64815 from RandomShaper/default_cpu_count

Browse Source 
Improve default `OS`'s CPU count getter
This commit is contained in:
Rémi Verschelde 2022-10-06 08:55:51 +02:00
commit c2c9a582da
5 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/os/os.cpp
View File

@ -38,6 +38,7 @@
#include "core/version_generated.gen.h"
#include <stdarg.h>
#include <thread>
OS *OS::singleton = nullptr;
uint64_t OS::target_ticks = 0;
@ -321,7 +322,7 @@ String OS::get_unique_id() const {
}
int OS::get_processor_count() const {
return 1;
return std::thread::hardware_concurrency();
}
String OS::get_processor_name() const {

4
drivers/unix/os_unix.cpp
View File

@ -500,10 +500,6 @@ bool OS_Unix::set_environment(const String &p_var, const String &p_value) const
return setenv(p_var.utf8().get_data(), p_value.utf8().get_data(), /* overwrite: */ true) == 0;
}
int OS_Unix::get_processor_count() const {
return sysconf(_SC_NPROCESSORS_CONF);
}
String OS_Unix::get_user_data_dir() const {
String appname = get_safe_dir_name(ProjectSettings::get_singleton()->get("application/config/name"));
if (!appname.is_empty()) {

2
drivers/unix/os_unix.h
View File

@ -84,8 +84,6 @@ public:
virtual bool set_environment(const String &p_var, const String &p_value) const override;
virtual String get_locale() const override;
virtual int get_processor_count() const override;
virtual void initialize_debugging() override;
virtual String get_executable_path() const override;

11
platform/windows/os_windows.cpp
View File

@ -870,17 +870,6 @@ BOOL is_wow64() {
return wow64;
}
int OS_Windows::get_processor_count() const {
SYSTEM_INFO sysinfo;
if (is_wow64()) {
GetNativeSystemInfo(&sysinfo);
} else {
GetSystemInfo(&sysinfo);
}
return sysinfo.dwNumberOfProcessors;
}
String OS_Windows::get_processor_name() const {
const String id = "Hardware\\Description\\System\\CentralProcessor\\0";

1
platform/windows/os_windows.h
View File

@ -175,7 +175,6 @@ public:
virtual String get_locale() const override;
virtual int get_processor_count() const override;
virtual String get_processor_name() const override;
virtual uint64_t get_embedded_pck_offset() const override;