public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: console: Make read() thread-safe. Date: Mon, 1 Feb 2021 10:01:18 +0000 (GMT) [thread overview] Message-ID: <20210201100118.04F5E385040E@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0b64cc6812e054dbc09cc1ee82b6582d4b5205e8 commit 0b64cc6812e054dbc09cc1ee82b6582d4b5205e8 Author: Takashi Yano via Cygwin-patches <cygwin-patches@cygwin.com> Date: Thu Jan 28 23:11:32 2021 +0900 Cygwin: console: Make read() thread-safe. - Currently read() is somehow not thread-safe. This patch fixes the issue. Diff: --- winsup/cygwin/fhandler.h | 10 ++++++++++ winsup/cygwin/fhandler_console.cc | 11 ++++++----- winsup/cygwin/fhandler_termios.cc | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index a4c1a3816..2fad7d33c 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1905,6 +1905,8 @@ class fhandler_termios: public fhandler_base tty_min *_tc; tty *get_ttyp () {return (tty *) tc ();} int eat_readahead (int n); + virtual void acquire_input_mutex_if_necessary (DWORD ms) {}; + virtual void release_input_mutex_if_necessary (void) {}; public: tty_min*& tc () {return _tc;} @@ -2212,6 +2214,14 @@ private: void __release_input_mutex (const char *fn, int ln); DWORD __acquire_output_mutex (const char *fn, int ln, DWORD ms); void __release_output_mutex (const char *fn, int ln); + void acquire_input_mutex_if_necessary (DWORD ms) + { + acquire_input_mutex (ms); + } + void release_input_mutex_if_necessary (void) + { + release_input_mutex (); + } char *&rabuf (); size_t &ralen (); diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 02d0ac052..0b404411e 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -571,31 +571,34 @@ wait_retry: #define buf ((char *) pv) int ret; - acquire_attach_mutex (INFINITE); acquire_input_mutex (INFINITE); + acquire_attach_mutex (INFINITE); ret = process_input_message (); - release_input_mutex (); release_attach_mutex (); switch (ret) { case input_error: + release_input_mutex (); goto err; case input_processing: + release_input_mutex (); continue; case input_ok: /* input ready */ break; case input_signalled: /* signalled */ + release_input_mutex (); goto sig_exit; case input_winch: + release_input_mutex (); continue; default: /* Should not come here */ + release_input_mutex (); goto err; } } /* Check console read-ahead buffer filled from terminal requests */ - acquire_input_mutex (INFINITE); while (con.cons_rapoi && *con.cons_rapoi && buflen) { buf[copied_chars++] = *con.cons_rapoi++; @@ -984,9 +987,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; diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc index 36bc6255f..9fbace95c 100644 --- a/winsup/cygwin/fhandler_termios.cc +++ b/winsup/cygwin/fhandler_termios.cc @@ -332,7 +332,9 @@ fhandler_termios::line_edit (const char *rptr, size_t nread, termios& ti, termios_printf ("got interrupt %d, sending signal %d", c, sig); eat_readahead (-1); + release_input_mutex_if_necessary (); tc ()->kill_pgrp (sig); + acquire_input_mutex_if_necessary (INFINITE); ti.c_lflag &= ~FLUSHO; sawsig = true; goto restart_output;
reply other threads:[~2021-02-01 10:01 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210201100118.04F5E385040E@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /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: linkBe 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).