mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-10 07:04:29 +00:00
Add a TSAN workaround and re-enable the test
This reverts commit 865602e8d1
.
This commit is contained in:
parent
8a50d47a46
commit
5f23da9939
2 changed files with 15 additions and 6 deletions
9
.github/workflows/main.yml
vendored
9
.github/workflows/main.yml
vendored
|
@ -117,12 +117,9 @@ jobs:
|
|||
- name: make
|
||||
run: |
|
||||
make
|
||||
# This is, once again, broken as of 2022-12-19.
|
||||
# It just hangs indefinitely. Github probably upgraded clang/Ubuntu.
|
||||
# Because that is unhelpful, we disable the tests once more.
|
||||
# - name: make test
|
||||
# run: |
|
||||
# make test
|
||||
- name: make test
|
||||
run: |
|
||||
make test
|
||||
|
||||
macos:
|
||||
|
||||
|
|
|
@ -366,6 +366,18 @@ void signal_set_handlers(bool interactive) {
|
|||
if (interactive) {
|
||||
set_interactive_handlers();
|
||||
}
|
||||
|
||||
#ifdef FISH_TSAN_WORKAROUNDS
|
||||
// Work around the following TSAN bug:
|
||||
// The structure containing signal information for a thread is lazily allocated by TSAN.
|
||||
// It is possible for the same thread to receive two allocations, if the signal handler
|
||||
// races with other allocation paths (e.g. a blocking call). This results in the first signal
|
||||
// being potentially dropped.
|
||||
// The workaround is to send ourselves a SIGCHLD signal now, to force the allocation to happen.
|
||||
// As no child is associated with this signal, it is OK if it is dropped, so long as the
|
||||
// allocation happens.
|
||||
(void)kill(getpid(), SIGCHLD);
|
||||
#endif
|
||||
}
|
||||
|
||||
void signal_set_handlers_once(bool interactive) {
|
||||
|
|
Loading…
Reference in a new issue