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

Remove fish_mutex_t wrapper around std::mutex

Browse Source 
@ridiculousfish had introduced this in 3a45cad12e
to work around an issue with Coverity Scan where it couldn't tell the
mutex was correctly locked, but even with the `fish_mutex_t` hack, it
still emits the same warnings, so there's no pointing in keeping it.
This commit is contained in:
Mahmoud Al-Qudsi
2018-12-30 20:15:49 -06:00
parent 077d656b87
commit bfe08a471d
8 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/iothread.cpp
View File

@@ -72,9 +72,9 @@ static owning_lock<thread_data_t> s_spawn_requests;
static owning_lock<std::queue<spawn_request_t>> s_result_queue;
// "Do on main thread" support.
static fish_mutex_t s_main_thread_performer_lock; // protects the main thread requests
static std::mutex s_main_thread_performer_lock; // protects the main thread requests
static std::condition_variable s_main_thread_performer_cond; // protects the main thread requests
static fish_mutex_t s_main_thread_request_q_lock; // protects the queue
static std::mutex s_main_thread_request_q_lock; // protects the queue
static std::queue<main_thread_request_t *> s_main_thread_request_queue;
// Notifying pipes.
@@ -332,7 +332,7 @@ void iothread_perform_on_main(void_function_t &&func) {
assert_with_errno(write_loop(s_write_pipe, &wakeup_byte, sizeof wakeup_byte) != -1);
// Wait on the condition, until we're done.
std::unique_lock<std::mutex> perform_lock(s_main_thread_performer_lock.get_mutex());
std::unique_lock<std::mutex> perform_lock(s_main_thread_performer_lock);
while (!req.done) {
// It would be nice to support checking for cancellation here, but the clients need a
// deterministic way to clean up to avoid leaks