From 81b34409985ce31415a1d994ef744e72cfb8c378 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Tue, 18 Feb 2020 18:12:54 +0900 Subject: [PATCH] Cygwin: console: Add guard for set/unset xterm compatible mode. - Setting / unsetting xterm compatible mode may cause race issue between multiple processes. This patch adds guard for that. --- winsup/cygwin/fhandler.h | 6 ++ winsup/cygwin/fhandler_console.cc | 125 +++++++++++++++++++++--------- winsup/cygwin/select.cc | 22 ++---- winsup/cygwin/spawn.cc | 8 +- 4 files changed, 103 insertions(+), 58 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 993d7355a..55f18aebd 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1911,6 +1911,8 @@ class dev_console bool raw_win32_keyboard_mode; char cons_rabuf[40]; // cannot get longer than char buf[40] in char_command char *cons_rapoi; + LONG xterm_mode_input; + LONG xterm_mode_output; inline UINT get_console_cp (); DWORD con_to_str (char *d, int dlen, WCHAR w); @@ -1983,6 +1985,7 @@ private: static bool create_invisible_console (HWINSTA); static bool create_invisible_console_workaround (); static console_state *open_shared_console (HWND, HANDLE&, bool&); + void fix_tab_position (void); public: static pid_t tc_getpgid () @@ -2072,6 +2075,9 @@ private: size_t &raixput (); size_t &rabuflen (); + void request_xterm_mode_input (bool); + void request_xterm_mode_output (bool); + friend tty_min * tty_list::get_cttyp (); }; diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index ce19a81a3..66e645aa1 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -53,8 +53,6 @@ fhandler_console::console_state NO_COPY *fhandler_console::shared_console_info; bool NO_COPY fhandler_console::invisible_console; -static DWORD orig_conout_mode = (DWORD) -1; - /* con_ra is shared in the same process. Only one console can exist in a process, therefore, static is suitable. */ static struct fhandler_base::rabuf_t con_ra; @@ -162,13 +160,17 @@ fhandler_console::set_unit () tty_min_state.setntty (DEV_CONS_MAJOR, console_unit (me)); devset = (fh_devices) shared_console_info->tty_min_state.getntty (); if (created) - con.owner = getpid (); + { + con.owner = myself->pid; + con.xterm_mode_input = 0; + con.xterm_mode_output = 0; + } } if (!created && shared_console_info) { pinfo p (con.owner); if (!p) - con.owner = getpid (); + con.owner = myself->pid; } dev ().parse (devset); @@ -247,6 +249,60 @@ fhandler_console::rabuflen () return con_ra.rabuflen; } +void +fhandler_console::request_xterm_mode_input (bool req) +{ + if (con_is_legacy) + return; + if (req) + { + if (InterlockedIncrement (&con.xterm_mode_input) == 1) + { + DWORD dwMode; + GetConsoleMode (get_handle (), &dwMode); + dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT; + SetConsoleMode (get_handle (), dwMode); + } + } + else + { + if (InterlockedDecrement (&con.xterm_mode_input) == 0) + { + DWORD dwMode; + GetConsoleMode (get_handle (), &dwMode); + dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT; + SetConsoleMode (get_handle (), dwMode); + } + } +} + +void +fhandler_console::request_xterm_mode_output (bool req) +{ + if (con_is_legacy) + return; + if (req) + { + if (InterlockedExchange (&con.xterm_mode_output, 1) == 0) + { + DWORD dwMode; + GetConsoleMode (get_output_handle (), &dwMode); + dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; + SetConsoleMode (get_output_handle (), dwMode); + } + } + else + { + if (InterlockedExchange (&con.xterm_mode_output, 0) == 1) + { + DWORD dwMode; + GetConsoleMode (get_output_handle (), &dwMode); + dwMode &= ~ENABLE_VIRTUAL_TERMINAL_PROCESSING; + SetConsoleMode (get_output_handle (), dwMode); + } + } +} + /* Return the tty structure associated with a given tty number. If the tty number is < 0, just return a dummy record. */ tty_min * @@ -347,8 +403,8 @@ fhandler_console::set_cursor_maybe () /* Workaround for a bug of windows xterm compatible mode. */ /* The horizontal tab positions are broken after resize. */ -static void -fix_tab_position (HANDLE h, SHORT width) +void +fhandler_console::fix_tab_position (void) { char buf[2048] = {0,}; /* Save cursor position */ @@ -356,15 +412,13 @@ fix_tab_position (HANDLE h, SHORT width) /* Clear all horizontal tabs */ __small_sprintf (buf+strlen (buf), "\033[3g"); /* Set horizontal tabs */ - for (int col=8; colkill_pgrp (SIGWINCH); return true; } @@ -427,11 +481,9 @@ fhandler_console::read (void *pv, size_t& buflen) set_input_state (); - DWORD dwMode; - GetConsoleMode (get_handle (), &dwMode); /* if system has 24 bit color capability, use xterm compatible mode. */ - if (wincap.has_con_24bit_colors () && !con_is_legacy) - SetConsoleMode (get_handle (), dwMode | ENABLE_VIRTUAL_TERMINAL_INPUT); + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_input (true); while (!input_ready && !get_cons_readahead_valid ()) { @@ -439,7 +491,8 @@ fhandler_console::read (void *pv, size_t& buflen) if ((bgres = bg_check (SIGTTIN)) <= bg_eof) { buflen = bgres; - SetConsoleMode (get_handle (), dwMode); /* Restore */ + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_input (false); return; } @@ -457,7 +510,8 @@ fhandler_console::read (void *pv, size_t& buflen) case WAIT_TIMEOUT: set_sig_errno (EAGAIN); buflen = (size_t) -1; - SetConsoleMode (get_handle (), dwMode); /* Restore */ + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_input (false); return; default: goto err; @@ -505,19 +559,22 @@ fhandler_console::read (void *pv, size_t& buflen) #undef buf buflen = copied_chars; - SetConsoleMode (get_handle (), dwMode); /* Restore */ + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_input (false); return; err: __seterrno (); buflen = (size_t) -1; - SetConsoleMode (get_handle (), dwMode); /* Restore */ + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_input (false); return; sig_exit: set_sig_errno (EINTR); buflen = (size_t) -1; - SetConsoleMode (get_handle (), dwMode); /* Restore */ + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_input (false); } fhandler_console::input_states @@ -1051,10 +1108,7 @@ fhandler_console::open (int flags, mode_t) get_ttyp ()->rstcons (false); set_open_status (); - if (orig_conout_mode == (DWORD) -1) - GetConsoleMode (get_output_handle (), &orig_conout_mode); - - if (getpid () == con.owner && wincap.has_con_24bit_colors ()) + if (myself->pid == con.owner && wincap.has_con_24bit_colors ()) { bool is_legacy = false; DWORD dwMode; @@ -1105,15 +1159,9 @@ fhandler_console::close () acquire_output_mutex (INFINITE); - if (shared_console_info && getpid () == con.owner && + if (shared_console_info && myself->pid == con.owner && wincap.has_con_24bit_colors () && !con_is_legacy) - { - DWORD dwMode; - /* Disable xterm compatible mode in output */ - GetConsoleMode (get_output_handle (), &dwMode); - dwMode &= ~ENABLE_VIRTUAL_TERMINAL_PROCESSING; - SetConsoleMode (get_output_handle (), dwMode); - } + request_xterm_mode_output (false); /* Restore console mode if this is the last closure. */ OBJECT_BASIC_INFORMATION obi; @@ -1121,8 +1169,8 @@ fhandler_console::close () status = NtQueryObject (get_handle (), ObjectBasicInformation, &obi, sizeof obi, NULL); if (NT_SUCCESS (status) && obi.HandleCount == 1) - if (orig_conout_mode != (DWORD) -1) - SetConsoleMode (get_output_handle (), orig_conout_mode); + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_output (false); release_output_mutex (); @@ -1295,6 +1343,8 @@ fhandler_console::output_tcsetattr (int, struct termios const *t) /* All the output bits we can ignore */ acquire_output_mutex (INFINITE); + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_output (false); DWORD flags = ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT; int res = SetConsoleMode (get_output_handle (), flags) ? 0 : -1; @@ -1765,7 +1815,7 @@ bool fhandler_console::write_console (PWCHAR buf, DWORD len, DWORD& done) } /* Call fix_tab_position() if screen has been alternated. */ if (need_fix_tab_position) - fix_tab_position (get_output_handle (), con.dwWinSize.X); + fix_tab_position (); return true; } @@ -2733,11 +2783,12 @@ fhandler_console::write (const void *vsrc, size_t len) acquire_output_mutex (INFINITE); /* If system has 24 bit color capability, use xterm compatible mode. */ + if (wincap.has_con_24bit_colors ()) + request_xterm_mode_output (true); if (wincap.has_con_24bit_colors () && !con_is_legacy) { DWORD dwMode; GetConsoleMode (get_output_handle (), &dwMode); - dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; if (!(get_ttyp ()->ti.c_oflag & OPOST) || !(get_ttyp ()->ti.c_oflag & ONLCR)) dwMode |= DISABLE_NEWLINE_AUTO_RETURN; diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index f3e3e4482..48a700132 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -1075,17 +1075,16 @@ verify_console (select_record *me, fd_set *rfds, fd_set *wfds, return peek_console (me, true); } +static void console_cleanup (select_record *, select_stuff *); + static int console_startup (select_record *me, select_stuff *stuff) { - select_record *s = stuff->start.next; + fhandler_console *fh = (fhandler_console *) me->fh; if (wincap.has_con_24bit_colors ()) { - DWORD dwMode; - GetConsoleMode (s->h, &dwMode); - /* Enable xterm compatible mode in input */ - dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT; - SetConsoleMode (s->h, dwMode); + fh->request_xterm_mode_input (true); + me->cleanup = console_cleanup; } return 1; } @@ -1093,15 +1092,9 @@ console_startup (select_record *me, select_stuff *stuff) static void console_cleanup (select_record *me, select_stuff *stuff) { - select_record *s = stuff->start.next; + fhandler_console *fh = (fhandler_console *) me->fh; if (wincap.has_con_24bit_colors ()) - { - DWORD dwMode; - GetConsoleMode (s->h, &dwMode); - /* Disable xterm compatible mode in input */ - dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT; - SetConsoleMode (s->h, dwMode); - } + fh->request_xterm_mode_input (false); } select_record * @@ -1117,7 +1110,6 @@ fhandler_console::select_read (select_stuff *ss) s->peek = peek_console; s->h = get_handle (); - s->cleanup = console_cleanup; s->read_selected = true; s->read_ready = input_ready || get_cons_readahead_valid (); return s; diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 772fe6dd6..3e8c8367a 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -614,14 +614,10 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, else if (fh && fh->get_major () == DEV_CONS_MAJOR) { attach_to_console = true; + fhandler_console *cons = (fhandler_console *) fh; if (wincap.has_con_24bit_colors () && !iscygwin ()) if (fd == 1 || fd == 2) - { - DWORD dwMode; - GetConsoleMode (fh->get_output_handle (), &dwMode); - dwMode &= ~ENABLE_VIRTUAL_TERMINAL_PROCESSING; - SetConsoleMode (fh->get_output_handle (), dwMode); - } + cons->request_xterm_mode_output (false); } } -- 2.43.5