drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: pty: Revise code to make system_printf() work after close. 

- After commit 0365031ce1, the issue
  https://cygwin.com/pipermail/cygwin-patches/2020q2/010259.html
  occurs. This patch fixes the issue.
This commit is contained in:
Takashi Yano via Cygwin-patches 2020-05-21 17:25:01 +09:00 committed by Corinna Vinschen
parent bf07202e16
commit c26e08095d
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/fhandler_tty.cc
View File

@ -64,6 +64,7 @@ static int pcon_attached_to = -1;
static bool isHybrid; static bool isHybrid;
static bool do_not_reset_switch_to_pcon; static bool do_not_reset_switch_to_pcon;
static bool freeconsole_on_close = true; static bool freeconsole_on_close = true;
static tty *last_ttyp = NULL;
void void
clear_pcon_attached_to (void) clear_pcon_attached_to (void)
@ -89,7 +90,11 @@ set_switch_to_pcon (void)
ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT; ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT;
SetConsoleMode (ptys->get_handle (), mode); SetConsoleMode (ptys->get_handle (), mode);
} }
return;
} }
/* No pty slave opened */
if (last_ttyp) /* Make system_printf() work after closing pty slave */
last_ttyp->set_switch_to_pcon_out (true);
} }
static void static void
@ -741,7 +746,10 @@ fhandler_pty_slave::~fhandler_pty_slave ()
needed to make GNU screen and tmux work in Windows 10 needed to make GNU screen and tmux work in Windows 10
1903. */ 1903. */
if (attached == 0) if (attached == 0)
pcon_attached_to = -1; {
pcon_attached_to = -1;
last_ttyp = get_ttyp ();
}
if (used == 0) if (used == 0)
{ {
init_console_handler (false); init_console_handler (false);
@ -948,6 +956,7 @@ fhandler_pty_slave::open (int flags, mode_t)
init_console_handler (true); init_console_handler (true);
} }
isHybrid = false;
get_ttyp ()->pcon_pid = 0; get_ttyp ()->pcon_pid = 0;
get_ttyp ()->switch_to_pcon_in = false; get_ttyp ()->switch_to_pcon_in = false;
get_ttyp ()->switch_to_pcon_out = false; get_ttyp ()->switch_to_pcon_out = false;
@ -1012,7 +1021,6 @@ fhandler_pty_slave::close ()
termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex); termios_printf ("CloseHandle (output_mutex<%p>), %E", output_mutex);
if (pcon_attached_to == get_minor ()) if (pcon_attached_to == get_minor ())
get_ttyp ()->num_pcon_attached_slaves --; get_ttyp ()->num_pcon_attached_slaves --;
set_switch_to_pcon (2); /* Make system_printf() work after close. */
return 0; return 0;
} }
@ -2888,7 +2896,8 @@ fhandler_pty_slave::wait_pcon_fwd (void)
get_ttyp ()->pcon_last_time = GetTickCount (); get_ttyp ()->pcon_last_time = GetTickCount ();
ResetEvent (get_ttyp ()->fwd_done); ResetEvent (get_ttyp ()->fwd_done);
release_output_mutex (); release_output_mutex ();
cygwait (get_ttyp ()->fwd_done, INFINITE); while (get_ttyp ()->fwd_done
&& cygwait (get_ttyp ()->fwd_done, 1) == WAIT_TIMEOUT);
} }
void void

23
winsup/cygwin/tty.cc
View File

@ -294,3 +294,26 @@ tty_min::ttyname ()
d.parse (ntty); d.parse (ntty);
return d.name (); return d.name ();
} }
void
tty::set_switch_to_pcon_out (bool v)
{
if (switch_to_pcon_out != v)
{
wait_pcon_fwd ();
switch_to_pcon_out = v;
}
}
void
tty::wait_pcon_fwd (void)
{
const int sleep_in_pcon = 16;
const int time_to_wait = sleep_in_pcon * 2 + 1/* margine */;
pcon_last_time = GetTickCount ();
while (GetTickCount () - pcon_last_time < time_to_wait)
{
int tw = time_to_wait - (GetTickCount () - pcon_last_time);
cygwait (tw);
}
}

2
winsup/cygwin/tty.h
View File

@ -140,6 +140,8 @@ public:
void set_master_ctl_closed () {master_pid = -1;} void set_master_ctl_closed () {master_pid = -1;}
static void __stdcall create_master (int); static void __stdcall create_master (int);
static void __stdcall init_session (); static void __stdcall init_session ();
void set_switch_to_pcon_out (bool v);
void wait_pcon_fwd (void);
friend class fhandler_pty_common; friend class fhandler_pty_common;
friend class fhandler_pty_master; friend class fhandler_pty_master;
friend class fhandler_pty_slave; friend class fhandler_pty_slave;