diff options
| author | Christopher Faylor <me@cgf.cx> | 2012-10-12 01:19:04 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2012-10-12 01:19:04 +0000 |
| commit | fe0cb311370003fc5839e592c79b460aa841a63b (patch) | |
| tree | a0c503ba875c81831a4462a3992658bb668a440c /winsup/cygwin/tty.h | |
| parent | 52985c1686253dbfe45756bdbefe9568ef401c4e (diff) | |
| download | cygnal-fe0cb311370003fc5839e592c79b460aa841a63b.tar.gz cygnal-fe0cb311370003fc5839e592c79b460aa841a63b.tar.bz2 cygnal-fe0cb311370003fc5839e592c79b460aa841a63b.zip | |
* 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'.
Diffstat (limited to 'winsup/cygwin/tty.h')
| -rw-r--r-- | winsup/cygwin/tty.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/winsup/cygwin/tty.h b/winsup/cygwin/tty.h index 4dc0395f5..65f184997 100644 --- a/winsup/cygwin/tty.h +++ b/winsup/cygwin/tty.h @@ -19,12 +19,10 @@ details. */ /* Input/Output/ioctl events */ -#define RESTART_OUTPUT_EVENT "cygtty.output.restart" #define INPUT_AVAILABLE_EVENT "cygtty.input.avail" #define OUTPUT_MUTEX "cygtty.output.mutex" #define INPUT_MUTEX "cygtty.input.mutex" #define TTY_SLAVE_ALIVE "cygtty.slave_alive" -#define TTY_MASTER_ALIVE "cygtty.master_alive" #include <sys/termios.h> @@ -38,15 +36,15 @@ class tty_min pid_t sid; /* Session ID of tty */ struct status_flags { - unsigned initialized : 1; /* Set if tty is initialized */ - unsigned rstcons : 1; /* Set if console needs to be set to "non-cooked" */ + unsigned initialized : 1; /* Set if tty is initialized */ + unsigned rstcons : 1; /* Set if console needs to be set to "non-cooked" */ } status; public: pid_t pgid; - int output_stopped; + bool output_stopped; /* FIXME: Maybe do this with a mutex someday? */ 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; IMPLEMENT_STATUS_FLAG (bool, initialized) |