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

* syscalls.cc (_read): Clarify debugging output.

This commit is contained in:
Christopher Faylor 2002-07-31 00:57:40 +00:00
parent c91a9a9b58
commit deaa100bae
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2002-07-30 Christopher Faylor <cgf@redhat.com>
* syscalls.cc (_read): Clarify debugging output.
2002-07-30 Christopher Faylor <cgf@redhat.com> 2002-07-30 Christopher Faylor <cgf@redhat.com>
* fhandler.h (fhandler_base::get_r_no_interrupt): Make virtual. * fhandler.h (fhandler_base::get_r_no_interrupt): Make virtual.

9
winsup/cygwin/syscalls.cc
View File

@ -305,10 +305,11 @@ _read (int fd, void *ptr, size_t len)
DWORD wait = cfd->is_nonblocking () ? 0 : INFINITE; DWORD wait = cfd->is_nonblocking () ? 0 : INFINITE;
/* Could block, so let user know we at least got here. */ /* Could block, so let user know we at least got here. */
syscall_printf ("read (%d, %p, %d) %sblocking, sigcatchers %d", fd, ptr, len, wait ? "" : "non", sigcatchers); syscall_printf ("read (%d, %p, %d) %sblocking, sigcatchers %d",
fd, ptr, len, wait ? "" : "non", sigcatchers);
if (wait && (!cfd->is_slow () || cfd->get_r_no_interrupt ())) if (wait && (!cfd->is_slow () || cfd->get_r_no_interrupt ()))
debug_printf ("non-interruptible read\n"); debug_printf ("no need to call ready_for_read\n");
else if (!cfd->ready_for_read (fd, wait)) else if (!cfd->ready_for_read (fd, wait))
{ {
res = -1; res = -1;
@ -318,7 +319,7 @@ _read (int fd, void *ptr, size_t len)
/* FIXME: This is not thread safe. We need some method to /* FIXME: This is not thread safe. We need some method to
ensure that an fd, closed in another thread, aborts I/O ensure that an fd, closed in another thread, aborts I/O
operations. */ operations. */
if (!cfd.isopen()) if (!cfd.isopen ())
return -1; return -1;
/* Check to see if this is a background read from a "tty", /* Check to see if this is a background read from a "tty",
@ -331,7 +332,7 @@ _read (int fd, void *ptr, size_t len)
if (res > bg_eof) if (res > bg_eof)
{ {
myself->process_state |= PID_TTYIN; myself->process_state |= PID_TTYIN;
if (!cfd.isopen()) if (!cfd.isopen ())
return -1; return -1;
res = cfd->read (ptr, len); res = cfd->read (ptr, len);
myself->process_state &= ~PID_TTYIN; myself->process_state &= ~PID_TTYIN;