summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fhandler_serial.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2011-12-13 04:11:48 +0000
committerChristopher Faylor <me@cgf.cx>2011-12-13 04:11:48 +0000
commit8cb58e85662d1a0c3288020780ce2389850dc465 (patch)
tree50aab7377010623e33643cd83deb564e747a5de7 /winsup/cygwin/fhandler_serial.cc
parenta7ea1550ff7a0a1dde12676fdcf25bf05937ca72 (diff)
downloadcygnal-8cb58e85662d1a0c3288020780ce2389850dc465.tar.gz
cygnal-8cb58e85662d1a0c3288020780ce2389850dc465.tar.bz2
cygnal-8cb58e85662d1a0c3288020780ce2389850dc465.zip
* cygthread.h (cygthread::name): Very minor formatting tweak.
* exceptions.cc (_cygtls::call_signal_handler): Add paranoid debugging output. * sigproc.h (cygwait): Call signal handler when signal is detected and loop as appropriate. * fhandler.h (fhandler_base_overlapped::wait_return): Remove overlapped_signal. * fhandler.cc (fhandler_base_overlapped::wait_overlapped): Remove restartable signal accommodations in light of cygwait improvements. (fhandler_base_overlapped::raw_read): Remove now-obsolete signal loop behavior. (fhandler_base_overlapped::raw_write): Ditto. * fhandler_console.cc (fhandler_console::read): Ditto. * fhandler_serial.cc (fhandler_serial::raw_read): Ditto. (fhandler_serial::raw_write): Ditto. * fhandler_tty.cc (fhandler_pty_slave::read): Ditto. * ioctl.cc (ioctl): Add standard syscall introducer and leaver debug output.
Diffstat (limited to 'winsup/cygwin/fhandler_serial.cc')
-rw-r--r--winsup/cygwin/fhandler_serial.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc
index 4c33d5e83..5a53a11fd 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler_serial.cc
@@ -95,7 +95,6 @@ fhandler_serial::raw_read (void *ptr, size_t& ulen)
else
{
overlapped_armed = 1;
-restart:
switch (cygwait (io_status.hEvent))
{
case WAIT_OBJECT_0:
@@ -105,8 +104,6 @@ restart:
debug_printf ("n %d, ev %x", n, ev);
break;
case WAIT_OBJECT_0 + 1:
- if (_my_tls.call_signal_handler ())
- goto restart;
tot = -1;
PurgeComm (get_handle (), PURGE_RXABORT);
overlapped_armed = 0;
@@ -202,14 +199,11 @@ fhandler_serial::raw_write (const void *ptr, size_t len)
if (!is_nonblocking ())
{
- restart:
switch (cygwait (write_status.hEvent))
{
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);