mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 04:47:35 +00:00
Kernel: Move Process's process group pointer into protected data
Now that it's no longer using LockRefPtr, we can actually move it into protected data. (LockRefPtr couldn't be stored there because protected data is immutable at times, and LockRefPtr uses some of its own bits for locking.)
This commit is contained in:
parent
1c77803845
commit
1e2ef59965
3 changed files with 7 additions and 11 deletions
|
@ -38,9 +38,9 @@ ErrorOr<FlatPtr> Process::sys$setsid()
|
|||
// Create a new Session and a new ProcessGroup.
|
||||
|
||||
auto process_group = TRY(ProcessGroup::create(ProcessGroupID(pid().value())));
|
||||
m_pg.with([&](auto& pg) { pg = move(process_group); });
|
||||
m_tty.with([](auto& tty) { tty = nullptr; });
|
||||
return with_mutable_protected_data([&](auto& protected_data) -> ErrorOr<FlatPtr> {
|
||||
protected_data.process_group = move(process_group);
|
||||
protected_data.sid = pid().value();
|
||||
return protected_data.sid.value();
|
||||
});
|
||||
|
@ -120,9 +120,8 @@ ErrorOr<FlatPtr> Process::sys$setpgid(pid_t specified_pid, pid_t specified_pgid)
|
|||
}
|
||||
// FIXME: There are more EPERM conditions to check for here..
|
||||
auto process_group = TRY(ProcessGroup::find_or_create(new_pgid));
|
||||
process->m_pg.with([&](auto& pg) { pg = move(process_group); });
|
||||
return with_mutable_protected_data([&](auto& protected_data) -> ErrorOr<FlatPtr> {
|
||||
auto credentials = this->credentials();
|
||||
return process->with_mutable_protected_data([&process, &process_group, new_sid, new_pgid](auto& protected_data) -> ErrorOr<FlatPtr> {
|
||||
auto credentials = process->credentials();
|
||||
|
||||
auto new_credentials = TRY(Credentials::create(
|
||||
credentials->uid(),
|
||||
|
@ -136,6 +135,7 @@ ErrorOr<FlatPtr> Process::sys$setpgid(pid_t specified_pid, pid_t specified_pgid)
|
|||
new_pgid));
|
||||
|
||||
protected_data.credentials = move(new_credentials);
|
||||
protected_data.process_group = move(process_group);
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue