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

* fhandler_serial.cc (fhandler_serial::raw_read): Add restartability 

after a signal.  Add cancelability.
	(fhandler_serial::raw_write): Wait for write to succeed if O_NONBLOCK
	is not set.  Add signal handling and cancelability.
This commit is contained in:
Corinna Vinschen 2011-05-02 10:20:35 +00:00
parent a91ac4dca9
commit 29b1327208
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2011-05-02 Corinna Vinschen <corinna@vinschen.de>
* fhandler_serial.cc (fhandler_serial::raw_read): Add restartability
after a signal. Add cancelability.
(fhandler_serial::raw_write): Wait for write to succeed if O_NONBLOCK
is not set. Add signal handling and cancelability.
2011-05-01 Corinna Vinschen <corinna@vinschen.de> 2011-05-01 Corinna Vinschen <corinna@vinschen.de>
* fhandler_windows.cc (fhandler_windows::read): Use * fhandler_windows.cc (fhandler_windows::read): Use

47
winsup/cygwin/fhandler_serial.cc
View File

@ -1,7 +1,7 @@
/* fhandler_serial.cc /* fhandler_serial.cc
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008, 2009 Red Hat, Inc. 2006, 2007, 2008, 2009, 2011 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -42,11 +42,8 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
{ {
int tot; int tot;
DWORD n; DWORD n;
HANDLE w4[2];
size_t minchars = vmin_ ? min (vmin_, ulen) : ulen;
w4[0] = io_status.hEvent; size_t minchars = vmin_ ? min (vmin_, ulen) : ulen;
w4[1] = signal_arrived;
debug_printf ("ulen %d, vmin_ %d, vtime_ %d, hEvent %p", ulen, vmin_, vtime_, debug_printf ("ulen %d, vmin_ %d, vtime_ %d, hEvent %p", ulen, vmin_, vtime_,
io_status.hEvent); io_status.hEvent);
@ -84,10 +81,14 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
} }
else if (GetLastError () != ERROR_IO_PENDING) else if (GetLastError () != ERROR_IO_PENDING)
goto err; goto err;
else else if (!is_nonblocking ())
{ {
HANDLE w4[3] = { io_status.hEvent, signal_arrived,
pthread::get_cancel_event () };
DWORD cnt = w4[2] ? 3 : 2;
overlapped_armed = 1; overlapped_armed = 1;
switch (WaitForMultipleObjects (2, w4, FALSE, INFINITE)) restart:
switch (WaitForMultipleObjects (cnt, w4, FALSE, INFINITE))
{ {
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
if (!GetOverlappedResult (get_handle (), &io_status, &n, if (!GetOverlappedResult (get_handle (), &io_status, &n,
@ -96,11 +97,18 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
debug_printf ("n %d, ev %x", n, ev); debug_printf ("n %d, ev %x", n, ev);
break; break;
case WAIT_OBJECT_0 + 1: case WAIT_OBJECT_0 + 1:
if (_my_tls.call_signal_handler ())
goto restart;
tot = -1; tot = -1;
PurgeComm (get_handle (), PURGE_RXABORT); PurgeComm (get_handle (), PURGE_RXABORT);
overlapped_armed = 0; overlapped_armed = 0;
set_sig_errno (EINTR); set_sig_errno (EINTR);
goto out; goto out;
case WAIT_OBJECT_0 + 2:
PurgeComm (get_handle (), PURGE_RXABORT);
overlapped_armed = 0;
pthread::static_cancel_self ();
/*NOTREACHED*/
default: default:
goto err; goto err;
} }
@ -174,6 +182,31 @@ fhandler_serial::raw_write (const void *ptr, size_t len)
goto err; goto err;
} }
if (!is_nonblocking ())
{
HANDLE w4[3] = { write_status.hEvent, signal_arrived,
pthread::get_cancel_event () };
DWORD cnt = w4[2] ? 3 : 2;
restart:
switch (WaitForMultipleObjects (cnt, w4, FALSE, INFINITE))
{
case WAIT_OBJECT_0:
break;
case WAIT_OBJECT_0 + 1:
if (_my_tls.call_signal_handler ())
goto restart;
PurgeComm (get_handle (), PURGE_TXABORT);
set_sig_errno (EINTR);
ForceCloseHandle (write_status.hEvent);
return -1;
case WAIT_OBJECT_0 + 2:
PurgeComm (get_handle (), PURGE_TXABORT);
pthread::static_cancel_self ();
/*NOTREACHED*/
default:
goto err;
}
}
if (!GetOverlappedResult (get_handle (), &write_status, &bytes_written, TRUE)) if (!GetOverlappedResult (get_handle (), &write_status, &bytes_written, TRUE))
goto err; goto err;