LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 01:37:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibCore: Add KeepAsChild option to Core::Process::spawn()

Browse Source 
This now allows spawning a process without disowning.
This commit is contained in:
MacDue 2023-03-15 16:49:13 +00:00 committed by Linus Groh
parent b3edd83e0a
commit d27a513dc5
Notes: sideshowbarker 2024-07-17 09:48:50 +09:00 
Author: https://github.com/MacDue
Commit: https://github.com/SerenityOS/serenity/commit/d27a513dc5
Pull-request: https://github.com/SerenityOS/serenity/pull/17840
Reviewed-by: https://github.com/LucasChollet
Reviewed-by: https://github.com/gmta
Reviewed-by: https://github.com/kleinesfilmroellchen ✅
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Userland/Libraries/LibCore/Process.cpp
View File

@ -54,7 +54,7 @@ struct ArgvList {
m_working_directory = working_directory;
}
ErrorOr<pid_t> spawn()
ErrorOr<pid_t> spawn(Process::KeepAsChild keep_as_child)
{
#ifdef AK_OS_SERENITY
posix_spawn_file_actions_t spawn_actions;
@ -66,24 +66,27 @@ struct ArgvList {
posix_spawn_file_actions_addchdir(&spawn_actions, m_working_directory.characters());
auto pid = TRY(System::posix_spawn(m_path.view(), &spawn_actions, nullptr, const_cast<char**>(get().data()), environ));
TRY(System::disown(pid));
if (keep_as_child == Process::KeepAsChild::No)
TRY(System::disown(pid));
#else
auto pid = TRY(System::posix_spawn(m_path.view(), nullptr, nullptr, const_cast<char**>(get().data()), environ));
// FIXME: Support keep_as_child outside Serenity.
(void)keep_as_child;
#endif
return pid;
}
};
ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<DeprecatedString> arguments, DeprecatedString working_directory)
ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<DeprecatedString> arguments, DeprecatedString working_directory, KeepAsChild keep_as_child)
{
ArgvList argv { path, arguments.size() };
for (auto const& arg : arguments)
argv.append(arg.characters());
argv.set_working_directory(working_directory);
return argv.spawn();
return argv.spawn(keep_as_child);
}
ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<StringView> arguments, DeprecatedString working_directory)
ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<StringView> arguments, DeprecatedString working_directory, KeepAsChild keep_as_child)
{
Vector<DeprecatedString> backing_strings;
backing_strings.ensure_capacity(arguments.size());
@ -93,16 +96,16 @@ ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<StringView> argument
argv.append(backing_strings.last().characters());
}
argv.set_working_directory(working_directory);
return argv.spawn();
return argv.spawn(keep_as_child);
}
ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<char const*> arguments, DeprecatedString working_directory)
ErrorOr<pid_t> Process::spawn(StringView path, ReadonlySpan<char const*> arguments, DeprecatedString working_directory, KeepAsChild keep_as_child)
{
ArgvList argv { path, arguments.size() };
for (auto arg : arguments)
argv.append(arg);
argv.set_working_directory(working_directory);
return argv.spawn();
return argv.spawn(keep_as_child);
}
ErrorOr<String> Process::get_name()

11
Userland/Libraries/LibCore/Process.h
View File

@ -15,9 +15,14 @@ namespace Core {
class Process {
public:
static ErrorOr<pid_t> spawn(StringView path, ReadonlySpan<DeprecatedString> arguments, DeprecatedString working_directory = {});
static ErrorOr<pid_t> spawn(StringView path, ReadonlySpan<StringView> arguments, DeprecatedString working_directory = {});
static ErrorOr<pid_t> spawn(StringView path, ReadonlySpan<char const*> arguments = {}, DeprecatedString working_directory = {});
enum class KeepAsChild {
Yes,
No
};
static ErrorOr<pid_t> spawn(StringView path, ReadonlySpan<DeprecatedString> arguments, DeprecatedString working_directory = {}, KeepAsChild keep_as_child = KeepAsChild::No);
static ErrorOr<pid_t> spawn(StringView path, ReadonlySpan<StringView> arguments, DeprecatedString working_directory = {}, KeepAsChild keep_as_child = KeepAsChild::No);
static ErrorOr<pid_t> spawn(StringView path, ReadonlySpan<char const*> arguments = {}, DeprecatedString working_directory = {}, KeepAsChild keep_as_child = KeepAsChild::No);
static ErrorOr<String> get_name();
enum class SetThreadName {