libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-01-19 04:49:25 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: AF_UNIX: sendmsg: fix signal handling

Browse Source 
If a blocking write is interrupted by a signal and call_signal_handler
returns nonzero, resume waiting for the write to complete.
This commit is contained in:
Ken Brown 2020-10-01 10:52:10 -04:00
parent add34a7b53
commit 780133d455
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/fhandler_socket_unix.cc
View File

@ -2065,6 +2065,7 @@ fhandler_socket_unix::sendmsg (const struct msghdr *msg, int flags)
io_unlock ();
if (evt && status == STATUS_PENDING)
{
wait:
DWORD ret = cygwait (evt, cw_infinite, cw_cancel | cw_sig_eintr);
switch (ret)
{
@ -2097,6 +2098,13 @@ fhandler_socket_unix::sendmsg (const struct msghdr *msg, int flags)
if (get_socket_type () == SOCK_STREAM && !(flags & MSG_NOSIGNAL))
raise (SIGPIPE);
}
else if (status == STATUS_THREAD_SIGNALED)
{
if (_my_tls.call_signal_handler ())
goto wait;
else
set_errno (EINTR);
}
else
__seterrno_from_nt_status (status);
}
@ -2108,9 +2116,7 @@ fhandler_socket_unix::sendmsg (const struct msghdr *msg, int flags)
NtClose (fh);
if (evt)
NtClose (evt);
if (status == STATUS_THREAD_SIGNALED && !_my_tls.call_signal_handler ())
set_errno (EINTR);
else if (status == STATUS_THREAD_CANCELED)
if (status == STATUS_THREAD_CANCELED)
pthread::static_cancel_self ();
return ret;
}