Skip to content

signal: Do not handle signal when __SIGFLUSHFAST is sent #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dscho merged 4 commits into from
Dec 29, 2024
Merged

signal: Do not handle signal when __SIGFLUSHFAST is sent #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33799c2
Cygwin: signal: Do not handle signal when __SIGFLUSHFAST is sent
tyan0 Dec 23, 2024
e971008
Merge branch 'special-case-sigflushfast'
dscho Dec 26, 2024
c3f1764
fixup! CI: add a GHA for doing a basic build test
dscho Dec 26, 2024
0202cf9
fixup! Avoid sharing cygheaps across Cygwin versions
dscho Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# resulting in errors due to -Werror. Disable them for now.
export CXXFLAGS="-Wno-error=stringop-truncation -Wno-error=array-bounds -Wno-error=overloaded-virtual -Wno-narrowing -Wno-use-after-free -Wno-error=maybe-uninitialized"
(cd winsup && ./autogen.sh)
./configure --disable-dependency-tracking
./configure --disable-dependency-tracking --with-msys2-runtime-commit=$GITHUB_SHA
make -j8

- name: Install
Expand Down
2 changes: 1 addition & 1 deletion winsup/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ yes|auto)
MSYS2_RUNTIME_COMMIT_SHORT="$(expr "$MSYS2_RUNTIME_COMMIT" : '\(.\{,8\}\)')"
MSYS2_RUNTIME_COMMIT_HEX="0x${MSYS2_RUNTIME_COMMIT_SHORT}ul"
else
AC_MSG_WARN([Could not determine msys2-runtime commit"])
AC_MSG_WARN([Could not determine msys2-runtime commit])
MSYS2_RUNTIME_COMMIT=
MSYS2_RUNTIME_COMMIT_SHORT=
MSYS2_RUNTIME_COMMIT_HEX=0
Expand Down
5 changes: 5 additions & 0 deletions winsup/cygwin/release/3.5.6
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Fixes:
------

- Fix zsh hang at startup.
Addresses: https://cygwin.com/pipermail/cygwin/2024-December/256954.html
20 changes: 15 additions & 5 deletions winsup/cygwin/sigproc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,10 +751,14 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls)
res = WriteFile (sendsig, leader, packsize, &nb, NULL);
if (!res || packsize == nb)
break;
if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED)
if (cygwait (NULL, 10, cw_sig_eintr) == WAIT_SIGNALED
&& pack.si.si_signo != __SIGFLUSHFAST)
_my_tls.call_signal_handler ();
res = 0;
}
/* Re-assert signal_arrived which has been cleared in cygwait(). */
if (_my_tls.sig)
_my_tls.set_signal_arrived ();

if (!res)
{
Expand Down Expand Up @@ -785,7 +789,16 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls)
if (wait_for_completion)
{
sigproc_printf ("Waiting for pack.wakeup %p", pack.wakeup);
rc = cygwait (pack.wakeup, WSSC);
do
{
rc = cygwait (pack.wakeup, WSSC, cw_sig_eintr);
if (rc == WAIT_SIGNALED && pack.si.si_signo != __SIGFLUSHFAST)
_my_tls.call_signal_handler ();
}
while (rc != WAIT_OBJECT_0 && rc != WAIT_TIMEOUT);
/* Re-assert signal_arrived which has been cleared in cygwait(). */
if (_my_tls.sig)
_my_tls.set_signal_arrived ();
ForceCloseHandle (pack.wakeup);
}
else
Expand All @@ -806,9 +819,6 @@ sig_send (_pinfo *p, siginfo_t& si, _cygtls *tls)
rc = -1;
}

if (wait_for_completion && si.si_signo != __SIGFLUSHFAST)
_my_tls.call_signal_handler ();

out:
if (communing && rc)
{
Expand Down