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

* exceptions.cc (_cygtls::call_signal_handler): Fix debugging to not go to

Browse Source 
console.
* fhandler.cc (fhandler_base_overlapped::wait_overlapped): Add temporary kludge
to work around problem of make closing a handler while it is being read.
* gendef (sigdelayed): Don't call a function if sig has been cleared.
* sigproc.h (cygwait): Simplify slightly.
This commit is contained in:
Christopher Faylor
2011-12-16 05:27:15 +00:00
parent e553b822e2
commit 08e4b6acb7
5 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,14 @@
2011-12-16 Christopher Faylor <me.cygwin2011@cgf.cx>
* exceptions.cc (_cygtls::call_signal_handler): Fix debugging to not go
to console.
* fhandler.cc (fhandler_base_overlapped::wait_overlapped): Add temporary
kludge to work around problem of make closing a handler while it is
being read.
* gendef (sigdelayed): Don't call a function if sig has been cleared.
* sigproc.h (cygwait): Simplify slightly.
2011-12-14 Corinna Vinschen <vinschen@redhat.com>
* autoload.cc (GetSystemWow64DirectoryW): Define.

2
winsup/cygwin/exceptions.cc
View File

@@ -1330,7 +1330,7 @@ _cygtls::call_signal_handler ()
_main_tls->lock ();
if (_main_tls->sig && _main_tls->incyg)
{
small_printf ("Redirecting to main_tls signal %d", _main_tls->sig);
paranoid_printf ("Redirecting to main_tls signal %d", _main_tls->sig);
sig = _main_tls->sig;
sa_flags = _main_tls->sa_flags;
func = _main_tls->func;

32
winsup/cygwin/fhandler.cc
View File

@@ -1925,25 +1925,31 @@ fhandler_base_overlapped::wait_overlapped (bool inres, bool writing, DWORD *byte
}
if (res == overlapped_unknown)
{
HANDLE h = writing ? get_output_handle () : get_handle ();
DWORD wfres = cygwait (get_overlapped ()->hEvent);
/* Cancelling here to prevent races. It's possible that the I/O has
completed already, in which case this is a no-op. Otherwise,
WFMO returned because 1) This is a non-blocking call, 2) a signal
arrived, or 3) the operation was cancelled. These cases may be
overridden by the return of GetOverlappedResult which could detect
that I/O completion occurred. */
CancelIo (h);
BOOL wores = GetOverlappedResult (h, get_overlapped (), bytes, false);
err = GetLastError ();
ResetEvent (get_overlapped ()->hEvent); /* Probably not needed but CYA */
debug_printf ("wfres %d, wores %d, bytes %u", wfres, wores, *bytes);
HANDLE h = writing ? get_output_handle () : get_handle ();
BOOL wores;
if (wfres == WAIT_OBJECT_0 + 1 && !get_overlapped ())
wores = 0;
else
{
/* Cancelling here to prevent races. It's possible that the I/O has
completed already, in which case this is a no-op. Otherwise,
WFMO returned because 1) This is a non-blocking call, 2) a signal
arrived, or 3) the operation was cancelled. These cases may be
overridden by the return of GetOverlappedResult which could detect
that I/O completion occurred. */
CancelIo (h);
BOOL wores = GetOverlappedResult (h, get_overlapped (), bytes, false);
err = GetLastError ();
ResetEvent (get_overlapped ()->hEvent); /* Probably not needed but CYA */
debug_printf ("wfres %d, wores %d, bytes %u", wfres, wores, *bytes);
}
if (wores)
res = overlapped_success; /* operation succeeded */
else if (wfres == WAIT_OBJECT_0 + 1)
{
err = ERROR_INVALID_AT_INTERRUPT_TIME; /* forces an EINTR below */
debug_printf ("unhandled signal");
debug_printf ("signal");
res = overlapped_error;
}
else if (nonblocking)

4
winsup/cygwin/gendef
View File

@@ -221,6 +221,10 @@ _sigdelayed:
call _yield
jmp 1b
2: incl $tls::incyg(%ebx)
movl $tls::sig(%ebx),%eax
testl %eax,%eax
jz 4f # call_signal_handler may have beat us
# to it
pushl $tls::saved_errno(%ebx) # saved errno
call _set_process_mask_delta
pushl %eax

9
winsup/cygwin/sigproc.h
View File

@@ -87,14 +87,11 @@ cygwait (HANDLE h, DWORD howlong = INFINITE)
HANDLE w4[3];
DWORD n = 0;
DWORD wait_signal;
if ((w4[n] = h) == NULL)
if ((w4[n] = h) != NULL)
wait_signal = WAIT_OBJECT_0 + ++n;
else
wait_signal = WAIT_OBJECT_0 + 15; /* Arbitrary. Don't call signal
handler if only waiting for signal */
else
{
n++;
wait_signal = n;
}
w4[n++] = signal_arrived;
if ((w4[n] = pthread::get_cancel_event ()) != NULL)
n++;