github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Revert "Remove unnecessary owning_lock usages"

Browse Source 
This reverts commit 3a5585df95.

This reverts a change that removed a lock. It's indeed true that in master,
fish script is bound to the main thread. But I'm working to remove that
limitation and these locks are important in that future.
This commit is contained in:
ridiculousfish 2020-07-12 18:56:39 -07:00
parent 4904e4bc41
commit 37dc554fe1
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/common.h
View File

@ -503,28 +503,6 @@ class owning_lock {
acquired_lock<Data> acquire() { return {lock, &data}; }
};
// An owning wrapper with exclusive ownership semantics, guaranteed by
// our thread_id() value. Allows us to avoid syscalls as compared to
// owning_lock.
template <typename T>
class thread_exclusive {
T data;
public:
thread_exclusive(T &&t) : data(std::move(t)) {}
thread_exclusive(T &t) : data(t) {}
thread_exclusive() : data() {}
inline T &operator*() {
ASSERT_IS_MAIN_THREAD();
return data;
}
inline T *operator->() {
ASSERT_IS_MAIN_THREAD();
return &data;
}
};
/// A scoped manager to save the current value of some variable, and optionally set it to a new
/// value. On destruction it restores the variable to its old value.
///

16
src/proc.cpp
View File

@ -96,10 +96,10 @@ void proc_init() { signal_set_handlers_once(false); }
// Basic thread safe sorted vector of job IDs in use.
// This is deliberately leaked to avoid dtor ordering issues - see #6539.
static const auto locked_consumed_job_ids = new thread_exclusive<std::vector<job_id_t>>();
static const auto locked_consumed_job_ids = new owning_lock<std::vector<job_id_t>>();
job_id_t acquire_job_id() {
auto &consumed_job_ids = *locked_consumed_job_ids;
auto consumed_job_ids = locked_consumed_job_ids->acquire();
// The new job ID should be larger than the largest currently used ID (#6053).
job_id_t jid = consumed_job_ids->empty() ? 1 : consumed_job_ids->back() + 1;
@ -109,7 +109,7 @@ job_id_t acquire_job_id() {
void release_job_id(job_id_t jid) {
assert(jid > 0);
auto &consumed_job_ids = *locked_consumed_job_ids;
auto consumed_job_ids = locked_consumed_job_ids->acquire();
// Our job ID vector is sorted, but the number of jobs is typically 1 or 2 so a binary search
// isn't worth it.
@ -412,7 +412,7 @@ bool job_t::has_external_proc() const {
/// A list of pids/pgids that have been disowned. They are kept around until either they exit or
/// we exit. Poll these from time-to-time to prevent zombie processes from happening (#5342).
static thread_exclusive<std::vector<pid_t>> s_disowned_pids;
static owning_lock<std::vector<pid_t>> s_disowned_pids;
void add_disowned_pgid(pid_t pgid) {
// NEVER add our own (or an invalid) pgid as they are not unique to only
@ -420,19 +420,19 @@ void add_disowned_pgid(pid_t pgid) {
if (pgid != getpgrp() && pgid > 0) {
// waitpid(2) is signalled to wait on a process group rather than a
// process id by using the negative of its value.
s_disowned_pids->push_back(pgid * -1);
s_disowned_pids.acquire()->push_back(pgid * -1);
}
}
// Reap any pids in our disowned list that have exited. This is used to avoid zombies.
static void reap_disowned_pids() {
auto &disowned_pids = *s_disowned_pids;
auto disowned_pids = s_disowned_pids.acquire();
auto try_reap1 = [](pid_t pid) {
int status;
return waitpid(pid, &status, WNOHANG) > 0;
};
disowned_pids.erase(std::remove_if(disowned_pids.begin(), disowned_pids.end(), try_reap1),
disowned_pids.end());
disowned_pids->erase(std::remove_if(disowned_pids->begin(), disowned_pids->end(), try_reap1),
disowned_pids->end());
}
/// See if any reapable processes have exited, and mark them accordingly.