libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Debug printfs. 

* fhandler.cc (fhandler_base::get_readahead): Add debug code.
	* fhandler_console.cc (fhandler_console::read): Add debug code.
	* select.cc (pselect): Add debug code.
	(peek_console): Add debug code.
This commit is contained in:
John Hood 2016-01-30 17:37:33 -05:00 committed by Corinna Vinschen
parent 6e70fd315a
commit 9f82de59a0
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
winsup/cygwin/fhandler.cc
View File

@ -90,6 +90,7 @@ fhandler_base::get_readahead ()
/* FIXME - not thread safe */ /* FIXME - not thread safe */
if (raixget >= ralen) if (raixget >= ralen)
raixget = raixput = ralen = 0; raixget = raixput = ralen = 0;
debug_printf("available: %d", chret > -1);
return chret; return chret;
} }

10
winsup/cygwin/fhandler_console.cc
View File

@ -309,6 +309,8 @@ fhandler_console::read (void *pv, size_t& buflen)
int ch; int ch;
set_input_state (); set_input_state ();
debug_printf("requested buflen %d", buflen);
/* Check console read-ahead buffer filled from terminal requests */ /* Check console read-ahead buffer filled from terminal requests */
if (con.cons_rapoi && *con.cons_rapoi) if (con.cons_rapoi && *con.cons_rapoi)
{ {
@ -318,6 +320,7 @@ fhandler_console::read (void *pv, size_t& buflen)
} }
int copied_chars = get_readahead_into_buffer (buf, buflen); int copied_chars = get_readahead_into_buffer (buf, buflen);
debug_printf("copied_chars %d", copied_chars);
if (copied_chars) if (copied_chars)
{ {
@ -695,9 +698,11 @@ fhandler_console::read (void *pv, size_t& buflen)
continue; continue;
} }
debug_printf("toadd = %p, nread = %d", toadd, nread);
if (toadd) if (toadd)
{ {
line_edit_status res = line_edit (toadd, nread, ti); ssize_t bytes_read;
line_edit_status res = line_edit (toadd, nread, ti, &bytes_read);
if (res == line_edit_signalled) if (res == line_edit_signalled)
goto sig_exit; goto sig_exit;
else if (res == line_edit_input_done) else if (res == line_edit_input_done)
@ -705,6 +710,8 @@ fhandler_console::read (void *pv, size_t& buflen)
} }
} }
debug_printf("ralen = %d, bytes = %d", ralen, ralen - raixget);
while (buflen) while (buflen)
if ((ch = get_readahead ()) < 0) if ((ch = get_readahead ()) < 0)
break; break;
@ -716,6 +723,7 @@ fhandler_console::read (void *pv, size_t& buflen)
#undef buf #undef buf
buflen = copied_chars; buflen = copied_chars;
debug_printf("buflen set to %d", buflen);
return; return;
err: err:

12
winsup/cygwin/select.cc
View File

@ -925,18 +925,28 @@ peek_console (select_record *me, bool)
if (irec.Event.KeyEvent.bKeyDown if (irec.Event.KeyEvent.bKeyDown
&& (irec.Event.KeyEvent.uChar.AsciiChar && (irec.Event.KeyEvent.uChar.AsciiChar
|| fhandler_console::get_nonascii_key (irec, tmpbuf))) || fhandler_console::get_nonascii_key (irec, tmpbuf)))
return me->read_ready = true; {
debug_printf("peeked KEY_EVENT");
return me->read_ready = true;
}
} }
else else
{ {
if (irec.EventType == MOUSE_EVENT if (irec.EventType == MOUSE_EVENT
&& fh->mouse_aware (irec.Event.MouseEvent)) && fh->mouse_aware (irec.Event.MouseEvent))
{
debug_printf("peeked MOUSE_EVENT");
return me->read_ready = true; return me->read_ready = true;
}
if (irec.EventType == FOCUS_EVENT && fh->focus_aware ()) if (irec.EventType == FOCUS_EVENT && fh->focus_aware ())
{
debug_printf("peeked FOCUS_EVENT");
return me->read_ready = true; return me->read_ready = true;
}
} }
/* Read and discard the event */ /* Read and discard the event */
debug_printf("discarded other event");
ReadConsoleInput (h, &irec, 1, &events_read); ReadConsoleInput (h, &irec, 1, &events_read);
} }