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

Merge pull request #94978 from bruvzg/macos_pid_map 

[macOS] Fix `is_process_running` and  `kill` for bundled apps.
This commit is contained in:
Rémi Verschelde 2024-07-31 17:07:18 +02:00 committed by GitHub
parent 1d57b81d26 1dfcbccfe6
commit db414b647a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/classes/OS.xml
View File

@ -422,6 +422,7 @@
<description>
Returns the exit code of a spawned process once it has finished running (see [method is_process_running]).
Returns [code]-1[/code] if the [param pid] is not a PID of a spawned child process, the process is still running, or the method is not implemented for the current platform.
[b]Note:[/b] Returns [code]-1[/code] if the [param pid] is a macOS bundled app process.
[b]Note:[/b] This method is implemented on Android, Linux, macOS and Windows.
</description>
</method>

2
platform/macos/os_macos.h
View File

@ -109,6 +109,8 @@ public:
virtual String get_executable_path() const override;
virtual Error create_process(const String &p_path, const List<String> &p_arguments, ProcessID *r_child_id = nullptr, bool p_open_console = false) override;
virtual Error create_instance(const List<String> &p_arguments, ProcessID *r_child_id = nullptr) override;
virtual Error kill(const ProcessID &p_pid) override;
virtual bool is_process_running(const ProcessID &p_pid) const override;
virtual String get_unique_id() const override;
virtual String get_processor_name() const override;

18
platform/macos/os_macos.mm
View File

@ -666,6 +666,24 @@ Error OS_MacOS::create_instance(const List<String> &p_arguments, ProcessID *r_ch
}
}
bool OS_MacOS::is_process_running(const ProcessID &p_pid) const {
NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier:(pid_t)p_pid];
if (!app) {
return OS_Unix::is_process_running(p_pid);
}
return ![app isTerminated];
}
Error OS_MacOS::kill(const ProcessID &p_pid) {
NSRunningApplication *app = [NSRunningApplication runningApplicationWithProcessIdentifier:(pid_t)p_pid];
if (!app) {
return OS_Unix::kill(p_pid);
}
return [app forceTerminate] ? OK : ERR_INVALID_PARAMETER;
}
String OS_MacOS::get_unique_id() const {
static String serial_number;