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

Shell: Remove WAITID_ONCE workaround

Browse Source 
This hashmap is no longer necessary, and the shell works just fine
without it now. Remove the conditionally compiled code.
This commit is contained in:
Andrew Kaster 2021-02-26 15:11:26 -07:00 committed by Andreas Kling
parent 8fc862f710
commit 2930014c2a
Notes: sideshowbarker 2024-07-18 21:51:24 +09:00 
Author: https://github.com/ADKaster
Commit: https://github.com/SerenityOS/serenity/commit/2930014c2a9
Pull-request: https://github.com/SerenityOS/serenity/pull/4921
Reviewed-by: https://github.com/alimpfard
Reviewed-by: https://github.com/awesomekling
Reviewed-by: https://github.com/linusg
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Userland/Shell/Shell.cpp
View File

@ -59,12 +59,6 @@ extern char** environ;
namespace Shell { namespace Shell {
// FIXME: This should eventually be removed once we've established that
// waitpid() is not passed the same job twice.
#ifdef __serenity__
# define ENSURE_WAITID_ONCE
#endif
void Shell::setup_signals() void Shell::setup_signals()
{ {
if (m_should_reinstall_signal_handlers) { if (m_should_reinstall_signal_handlers) {
@ -1602,9 +1596,6 @@ void Shell::custom_event(Core::CustomEvent& event)
void Shell::notify_child_event() void Shell::notify_child_event()
{ {
#ifdef ENSURE_WAITID_ONCE
static HashTable<pid_t> s_waited_for_pids;
#endif
Vector<u64> disowned_jobs; Vector<u64> disowned_jobs;
// Workaround the fact that we can't receive *who* exactly changed state. // Workaround the fact that we can't receive *who* exactly changed state.
// The child might still be alive (and even running) when this signal is dispatched to us // The child might still be alive (and even running) when this signal is dispatched to us
@ -1620,11 +1611,6 @@ void Shell::notify_child_event()
for (auto& it : jobs) { for (auto& it : jobs) {
auto job_id = it.key; auto job_id = it.key;
auto& job = *it.value; auto& job = *it.value;
#ifdef ENSURE_WAITID_ONCE
// Theoretically, this should never trip, as jobs are removed from
// the job table when waitpid() succeeds *and* the child is dead.
VERIFY(!s_waited_for_pids.contains(job.pid()));
#endif
int wstatus = 0; int wstatus = 0;
#if SH_DEBUG #if SH_DEBUG
@ -1658,18 +1644,6 @@ void Shell::notify_child_event()
job.set_is_suspended(true); job.set_is_suspended(true);
} }
found_child = true; found_child = true;
#ifdef ENSURE_WAITID_ONCE
// NOTE: This check is here to find bugs about our assumptions about waitpid(),
// it does not hold in general, and it definitely does not hold in the long run.
// Reasons that we would call waitpid() more than once:
// - PID reuse/wraparound: This will simply fail the assertion, ignored here.
// - Non-terminating unblocks:
// - Suspension: (e.g. via ^Z)
// - ?
// - ?
if (job.exited())
s_waited_for_pids.set(child_pid);
#endif
} }
if (job.should_be_disowned()) if (job.should_be_disowned())
disowned_jobs.append(job_id); disowned_jobs.append(job_id);