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

* fhandler_termios.cc (fhandler_termios::line_edit): Don't manipulate 

output_mutex on CTRL-S/CTRL-Q to avoid a deadlock.
* fhandler_tty.cc (fhandler_pty_slave::write): Loop when output_stopped is
detected before acquiring output_mutex.  Acquire output_mutex in the loop for
each write.
* tty.h: Remove some obsolete defines.
(tty_min::output_stopped): Make 'bool'.
This commit is contained in:
Christopher Faylor 2012-10-12 01:19:04 +00:00
parent 52985c1686
commit fe0cb31137
4 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
2012-10-11 Christopher Faylor <me.cygwin2012@cgf.cx>
* fhandler_termios.cc (fhandler_termios::line_edit): Don't manipulate
output_mutex on CTRL-S/CTRL-Q to avoid a deadlock.
* fhandler_tty.cc (fhandler_pty_slave::write): Loop when output_stopped
is detected before acquiring output_mutex. Acquire output_mutex in the
loop for each write.
* tty.h: Remove some obsolete defines.
(tty_min::output_stopped): Make 'bool'.
2012-10-10 Corinna Vinschen <corinna@vinschen.de> 2012-10-10 Corinna Vinschen <corinna@vinschen.de>
* include/cygwin/in.h (struct in_addr): Guard with s_addr to avoid * include/cygwin/in.h (struct in_addr): Guard with s_addr to avoid

8
winsup/cygwin/fhandler_termios.cc
View File

@ -286,17 +286,13 @@ fhandler_termios::line_edit (const char *rptr, int nread, termios& ti)
if (CCEQ (ti.c_cc[VSTOP], c)) if (CCEQ (ti.c_cc[VSTOP], c))
{ {
if (!tc ()->output_stopped) if (!tc ()->output_stopped)
{ tc ()->output_stopped = true;
tc ()->output_stopped = 1;
acquire_output_mutex (INFINITE);
}
continue; continue;
} }
else if (CCEQ (ti.c_cc[VSTART], c)) else if (CCEQ (ti.c_cc[VSTART], c))
{ {
restart_output: restart_output:
tc ()->output_stopped = 0; tc ()->output_stopped = false;
release_output_mutex ();
continue; continue;
} }
else if ((ti.c_iflag & IXANY) && tc ()->output_stopped) else if ((ti.c_iflag & IXANY) && tc ()->output_stopped)

12
winsup/cygwin/fhandler_tty.cc
View File

@ -645,8 +645,6 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
push_process_state process_state (PID_TTYOU); push_process_state process_state (PID_TTYOU);
acquire_output_mutex (INFINITE);
while (len) while (len)
{ {
n = MIN (OUT_BUFFER_SIZE, len); n = MIN (OUT_BUFFER_SIZE, len);
@ -654,6 +652,10 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
ptr = (char *) ptr + n; ptr = (char *) ptr + n;
len -= n; len -= n;
while (tc ()->output_stopped)
cygwait (10);
acquire_output_mutex (INFINITE);
/* Previous write may have set write_error to != 0. Check it here. /* Previous write may have set write_error to != 0. Check it here.
This is less than optimal, but the alternative slows down pty This is less than optimal, but the alternative slows down pty
writes enormously. */ writes enormously. */
@ -664,7 +666,9 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
break; break;
} }
if (WriteFile (get_output_handle (), buf, n, &n, NULL) == FALSE) DWORD res = WriteFile (get_output_handle (), buf, n, &n, NULL);
release_output_mutex ();
if (!res)
{ {
DWORD err = GetLastError (); DWORD err = GetLastError ();
termios_printf ("WriteFile failed, %E"); termios_printf ("WriteFile failed, %E");
@ -677,10 +681,10 @@ fhandler_pty_slave::write (const void *ptr, size_t len)
} }
raise (SIGHUP); /* FIXME: Should this be SIGTTOU? */ raise (SIGHUP); /* FIXME: Should this be SIGTTOU? */
towrite = (DWORD) -1; towrite = (DWORD) -1;
release_output_mutex ();
break; break;
} }
} }
release_output_mutex ();
return towrite; return towrite;
} }

4
winsup/cygwin/tty.h
View File

@ -19,12 +19,10 @@ details. */
/* Input/Output/ioctl events */ /* Input/Output/ioctl events */
#define RESTART_OUTPUT_EVENT "cygtty.output.restart"
#define INPUT_AVAILABLE_EVENT "cygtty.input.avail" #define INPUT_AVAILABLE_EVENT "cygtty.input.avail"
#define OUTPUT_MUTEX "cygtty.output.mutex" #define OUTPUT_MUTEX "cygtty.output.mutex"
#define INPUT_MUTEX "cygtty.input.mutex" #define INPUT_MUTEX "cygtty.input.mutex"
#define TTY_SLAVE_ALIVE "cygtty.slave_alive" #define TTY_SLAVE_ALIVE "cygtty.slave_alive"
#define TTY_MASTER_ALIVE "cygtty.master_alive"
#include <sys/termios.h> #include <sys/termios.h>
@ -44,7 +42,7 @@ class tty_min
public: public:
pid_t pgid; pid_t pgid;
int output_stopped; bool output_stopped; /* FIXME: Maybe do this with a mutex someday? */
fh_devices ntty; fh_devices ntty;
DWORD last_ctrl_c; /* tick count of last ctrl-c */ DWORD last_ctrl_c; /* tick count of last ctrl-c */
bool is_console; bool is_console;