JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* pinfo.h (class push_process_state): New class to push a process state

Browse Source 
flag temporarily into myself->process_state.
	* fhandler_console.cc (fhandler_console::read): Add push_process_state
	handler.
	(fhandler_console::write): Call bg_check from here.  Add
	push_process_state handler.
	* fhandler_tty.cc (fhandler_tty_slave::write): Ditto.
	(fhandler_tty_slave::read): Ditto.
	(fhandler_pty_master::write): Ditto.
	(fhandler_pty_master::read): Ditto.
	* syscalls.cc (readv): Remove bg_check call and setting process state.
	(writev): Ditto.
This commit is contained in:
Corinna Vinschen
2011-05-05 19:43:04 +00:00
parent 23db0a41d8
commit d8ff96389f
5 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
winsup/cygwin/fhandler_tty.cc
View File

@ -746,8 +746,14 @@ fhandler_tty_slave::write (const void *ptr, size_t len)
{
DWORD n, towrite = len;
bg_check_types bg = bg_check (SIGTTOU);
if (bg <= bg_eof)
return (ssize_t) bg;
termios_printf ("tty%d, write(%x, %d)", get_unit (), ptr, len);
push_process_state process_state (PID_TTYOU);
acquire_output_mutex (INFINITE);
while (len)
@ -807,8 +813,17 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
char peek_buf[INP_BUFFER_SIZE];
DWORD time_to_wait;
bg_check_types bg = bg_check (SIGTTIN);
if (bg <= bg_eof)
{
len = (size_t) bg;
return;
}
termios_printf ("read(%x, %d) handle %p", ptr, len, get_handle ());
push_process_state process_state (PID_TTYIN);
if (is_nonblocking () || !ptr) /* Indicating tcflush(). */
time_to_wait = 0;
else if ((get_ttyp ()->ti.c_lflag & ICANON))
@ -848,6 +863,7 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
totalread = -1;
goto out;
case WAIT_OBJECT_0 + 2:
process_state.pop ();
pthread::static_cancel_self ();
/*NOTREACHED*/
case WAIT_TIMEOUT:
@ -885,6 +901,7 @@ fhandler_tty_slave::read (void *ptr, size_t& len)
totalread = -1;
goto out;
case WAIT_OBJECT_0 + 2:
process_state.pop ();
pthread::static_cancel_self ();
/*NOTREACHED*/
case WAIT_TIMEOUT:
@ -1525,6 +1542,12 @@ fhandler_pty_master::write (const void *ptr, size_t len)
char *p = (char *) ptr;
termios ti = tc->ti;
bg_check_types bg = bg_check (SIGTTOU);
if (bg <= bg_eof)
return (ssize_t) bg;
push_process_state process_state (PID_TTYOU);
for (i = 0; i < (int) len; i++)
{
line_edit_status status = line_edit (p++, 1, ti);
@ -1541,6 +1564,13 @@ fhandler_pty_master::write (const void *ptr, size_t len)
void __stdcall
fhandler_pty_master::read (void *ptr, size_t& len)
{
bg_check_types bg = bg_check (SIGTTIN);
if (bg <= bg_eof)
{
len = (size_t) bg;
return;
}
push_process_state process_state (PID_TTYIN);
len = (size_t) process_slave_output ((char *) ptr, len, pktmode);
}