h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-03 01:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Collapse a job's "parent stuff" into a new type job_lineage_t

Browse Source 
Currently a job needs to know three things about its "parents:"

1. Any IO redirections for the block or function containing this job
2. The pgid for the parent job
3. Whether the parent job has been fully constructed (to defer self-disown)

These are all tracked in somewhat separate awkward ways. Collapse them
into a single new type job_lineage_t.
This commit is contained in:
ridiculousfish
2019-12-08 13:03:42 -08:00
parent e3b8203187
commit f136d634eb
7 changed files with 79 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/proc.cpp
View File

@@ -168,14 +168,7 @@ bool job_t::should_report_process_exits() const {
return false;
}
bool job_t::job_chain_is_fully_constructed() const {
const job_t *cursor = this;
while (cursor) {
if (!cursor->is_constructed()) return false;
cursor = cursor->get_parent().get();
}
return true;
}
bool job_t::job_chain_is_fully_constructed() const { return *lineage().root_constructed; }
bool job_t::signal(int signal) {
// Presumably we are distinguishing between the two cases below because we do
@@ -275,15 +268,14 @@ void process_t::check_generations_before_launch() {
gens_ = topic_monitor_t::principal().current_generations();
}
job_t::job_t(job_id_t job_id, const properties_t &props, io_chain_t bio,
std::shared_ptr<job_t> parent)
: properties(props), block_io(std::move(bio)), parent_job(std::move(parent)), job_id(job_id) {}
job_t::job_t(job_id_t job_id, const properties_t &props, job_lineage_t lineage)
: properties(props), job_lineage(std::move(lineage)), job_id(job_id) {}
job_t::~job_t() { release_job_id(job_id); }
/// Return all the IO redirections. Start with the block IO, then walk over the processes.
io_chain_t job_t::all_io_redirections() const {
io_chain_t result = this->block_io;
io_chain_t result = this->block_io_chain();
for (const process_ptr_t &p : this->processes) {
result.append(p->io_chain());
}