From: Takashi Yano <takashi.yano@nifty.ne.jp>
To: cygwin-patches@cygwin.com
Subject: [PATCH 1/2] Cygwin: console: Make read() thread-safe.
Date: Thu, 28 Jan 2021 20:14:08 +0900 [thread overview]
Message-ID: <20210128111409.581-2-takashi.yano@nifty.ne.jp> (raw)
In-Reply-To: <20210128111409.581-1-takashi.yano@nifty.ne.jp>
- Currently read() is somehow not thread-safe. This patch fixes the
issue.
---
winsup/cygwin/fhandler_console.cc | 7 +++----
winsup/cygwin/select.cc | 3 ---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 02d0ac052..8324faaa2 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -572,9 +572,7 @@ wait_retry:
int ret;
acquire_attach_mutex (INFINITE);
- acquire_input_mutex (INFINITE);
ret = process_input_message ();
- release_input_mutex ();
release_attach_mutex ();
switch (ret)
{
@@ -632,6 +630,7 @@ fhandler_console::process_input_message (void)
if (!shared_console_info)
return input_error;
+ acquire_input_mutex (INFINITE);
termios *ti = &(get_ttyp ()->ti);
fhandler_console::input_states stat = input_processing;
@@ -641,6 +640,7 @@ fhandler_console::process_input_message (void)
if (!PeekConsoleInputW (get_handle (), input_rec, INREC_SIZE, &total_read))
{
termios_printf ("PeekConsoleInput failed, %E");
+ release_input_mutex ();
return input_error;
}
@@ -984,9 +984,7 @@ fhandler_console::process_input_message (void)
if (toadd)
{
ssize_t ret;
- release_input_mutex ();
line_edit_status res = line_edit (toadd, nread, *ti, &ret);
- acquire_input_mutex (INFINITE);
if (res == line_edit_signalled)
{
stat = input_signalled;
@@ -1007,6 +1005,7 @@ out:
DWORD discard_len = min (total_read, i + 1);
if (discard_len)
ReadConsoleInputW (get_handle (), input_rec, discard_len, &dummy);
+ release_input_mutex ();
return stat;
}
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index dc75a2dbf..a4f401403 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -1083,17 +1083,14 @@ peek_console (select_record *me, bool)
}
else if (!PeekConsoleInputW (h, &irec, 1, &events_read) || !events_read)
break;
- fh->acquire_input_mutex (INFINITE);
if (fhandler_console::input_winch == fh->process_input_message ()
&& global_sigs[SIGWINCH].sa_handler != SIG_IGN
&& global_sigs[SIGWINCH].sa_handler != SIG_DFL)
{
set_sig_errno (EINTR);
- fh->release_input_mutex ();
release_attach_mutex ();
return -1;
}
- fh->release_input_mutex ();
}
release_attach_mutex ();
if (fh->input_ready || fh->get_cons_readahead_valid ())
--
2.30.0
next prev parent reply other threads:[~2021-01-28 11:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-28 11:14 [PATCH 0/2] Make terminal " Takashi Yano
2021-01-28 11:14 ` Takashi Yano [this message]
2021-01-28 11:49 ` [PATCH 1/2] Cygwin: console: Make " Takashi Yano
2021-01-28 11:14 ` [PATCH 2/2] Cygwin: pty: Make slave " Takashi Yano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210128111409.581-2-takashi.yano@nifty.ne.jp \
--to=takashi.yano@nifty.ne.jp \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).