libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: pty: Revise the code to wait for completion of forwarding.

Browse Source 
- With this patch, the code to wait for completion of forwarding of
  output from non-cygwin app is revised so that it can more reliably
  detect the completion.
This commit is contained in:
Takashi Yano 2022-02-10 17:47:51 +09:00
parent bddd9c1c41
commit b958e1f03a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/fhandler_tty.cc
View File

@ -1118,7 +1118,7 @@ fhandler_pty_slave::reset_switch_to_pcon (void)
if (WaitForSingleObject (h_gdb_process, 0) == WAIT_TIMEOUT) if (WaitForSingleObject (h_gdb_process, 0) == WAIT_TIMEOUT)
{ {
if (isHybrid) if (isHybrid)
get_ttyp ()->wait_pcon_fwd (false); get_ttyp ()->wait_pcon_fwd ();
} }
else else
{ {
@ -2705,6 +2705,9 @@ fhandler_pty_master::pty_master_fwd_thread (const master_fwd_thread_param_t *p)
for (;;) for (;;)
{ {
p->ttyp->pcon_last_time = GetTickCount (); p->ttyp->pcon_last_time = GetTickCount ();
DWORD n;
p->ttyp->pcon_fwd_not_empty =
::bytes_available (n, p->from_slave_nat) && n;
if (!ReadFile (p->from_slave_nat, outbuf, NT_MAX_PATH, &rlen, NULL)) if (!ReadFile (p->from_slave_nat, outbuf, NT_MAX_PATH, &rlen, NULL))
{ {
termios_printf ("ReadFile for forwarding failed, %E"); termios_printf ("ReadFile for forwarding failed, %E");

11
winsup/cygwin/tty.cc
View File

@ -240,6 +240,7 @@ tty::init ()
pcon_pid = 0; pcon_pid = 0;
term_code_page = 0; term_code_page = 0;
pcon_last_time = 0; pcon_last_time = 0;
pcon_fwd_not_empty = false;
pcon_start = false; pcon_start = false;
pcon_start_pid = 0; pcon_start_pid = 0;
pcon_cap_checked = false; pcon_cap_checked = false;
@ -367,7 +368,7 @@ tty_min::setpgid (int pid)
} }
void void
tty::wait_pcon_fwd (bool init) tty::wait_pcon_fwd ()
{ {
/* The forwarding in pseudo console sometimes stops for /* The forwarding in pseudo console sometimes stops for
16-32 msec even if it already has data to transfer. 16-32 msec even if it already has data to transfer.
@ -377,11 +378,11 @@ tty::wait_pcon_fwd (bool init)
thread when the last data is transfered. */ thread when the last data is transfered. */
const int sleep_in_pcon = 16; const int sleep_in_pcon = 16;
const int time_to_wait = sleep_in_pcon * 2 + 1/* margine */; const int time_to_wait = sleep_in_pcon * 2 + 1/* margine */;
if (init) int elapsed;
pcon_last_time = GetTickCount (); while (pcon_fwd_not_empty
while (GetTickCount () - pcon_last_time < time_to_wait) || (elapsed = GetTickCount () - pcon_last_time) < time_to_wait)
{ {
int tw = time_to_wait - (GetTickCount () - pcon_last_time); int tw = pcon_fwd_not_empty ? 10 : (time_to_wait - elapsed);
cygwait (tw); cygwait (tw);
} }
} }

3
winsup/cygwin/tty.h
View File

@ -116,6 +116,7 @@ private:
DWORD pcon_pid; DWORD pcon_pid;
UINT term_code_page; UINT term_code_page;
DWORD pcon_last_time; DWORD pcon_last_time;
bool pcon_fwd_not_empty;
HANDLE h_pcon_write_pipe; HANDLE h_pcon_write_pipe;
HANDLE h_pcon_condrv_reference; HANDLE h_pcon_condrv_reference;
HANDLE h_pcon_conhost_process; HANDLE h_pcon_conhost_process;
@ -166,7 +167,7 @@ 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 wait_pcon_fwd (bool init = true); void wait_pcon_fwd ();
bool pcon_input_state_eq (xfer_dir x) { return pcon_input_state == x; } bool pcon_input_state_eq (xfer_dir x) { return pcon_input_state == x; }
bool pcon_fg (pid_t pgid); bool pcon_fg (pid_t pgid);
friend class fhandler_pty_common; friend class fhandler_pty_common;