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

* exceptions.cc (sig_handle_tty_stop): Set stopsig to SIGCONT when continuing. 

(stopped_or_terminated): Honor WCONTINUED.
* wait.cc (wait4): Ditto.
* include/cygwin/wait.h (WCONTINUED): Define.
(__W_CONTINUED): Ditto.
(WIFCONTINUED): Ditto.
This commit is contained in:
Christopher Faylor 2009-07-18 20:25:07 +00:00
parent d4e45e3b99
commit acced2cea2
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,13 @@
2009-07-18 Christopher Faylor <me+cygwin@cgf.cx>
* exceptions.cc (sig_handle_tty_stop): Set stopsig to SIGCONT when
continuing.
(stopped_or_terminated): Honor WCONTINUED.
* wait.cc (wait4): Ditto.
* include/cygwin/wait.h (WCONTINUED): Define.
(__W_CONTINUED): Ditto.
(WIFCONTINUED): Ditto.
2009-07-18 Dave Korn <dave.korn.cygwin@gmail.com> 2009-07-18 Dave Korn <dave.korn.cygwin@gmail.com>
* libstdcxx_wrapper.cc (operator delete): Remove stray space in * libstdcxx_wrapper.cc (operator delete): Remove stray space in

1
winsup/cygwin/exceptions.cc
View File

@ -760,6 +760,7 @@ sig_handle_tty_stop (int sig)
case WAIT_OBJECT_0: case WAIT_OBJECT_0:
case WAIT_OBJECT_0 + 1: case WAIT_OBJECT_0 + 1:
reset_signal_arrived (); reset_signal_arrived ();
myself->stopsig = SIGCONT;
myself->alert_parent (SIGCONT); myself->alert_parent (SIGCONT);
break; break;
default: default:

5
winsup/cygwin/include/cygwin/wait.h
View File

@ -1,6 +1,6 @@
/* cygwin/wait.h /* cygwin/wait.h
Copyright 2006 Red Hat, Inc. Copyright 2006, 2009 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -13,6 +13,8 @@ details. */
#define WNOHANG 1 #define WNOHANG 1
#define WUNTRACED 2 #define WUNTRACED 2
#define WCONTINUED 8
#define __W_CONTINUED 0xffff
/* A status looks like: /* A status looks like:
<2 bytes info> <2 bytes code> <2 bytes info> <2 bytes code>
@ -26,6 +28,7 @@ details. */
#define WIFEXITED(w) (((w) & 0xff) == 0) #define WIFEXITED(w) (((w) & 0xff) == 0)
#define WIFSIGNALED(w) (((w) & 0x7f) > 0 && (((w) & 0x7f) < 0x7f)) #define WIFSIGNALED(w) (((w) & 0x7f) > 0 && (((w) & 0x7f) < 0x7f))
#define WIFSTOPPED(w) (((w) & 0xff) == 0x7f) #define WIFSTOPPED(w) (((w) & 0xff) == 0x7f)
#define WIFCONTINUED(w) (((w) & 0xffff) == __W_CONTINUED)
#define WEXITSTATUS(w) (((w) >> 8) & 0xff) #define WEXITSTATUS(w) (((w) >> 8) & 0xff)
#define WTERMSIG(w) ((w) & 0x7f) #define WTERMSIG(w) ((w) & 0x7f)
#define WSTOPSIG WEXITSTATUS #define WSTOPSIG WEXITSTATUS

5
winsup/cygwin/sigproc.cc
View File

@ -1050,7 +1050,7 @@ stopped_or_terminated (waitq *parent_w, _pinfo *child)
int terminated; int terminated;
if (!((terminated = (child->process_state == PID_EXITED)) || if (!((terminated = (child->process_state == PID_EXITED)) ||
((w->options & WUNTRACED) && child->stopsig))) ((w->options & (WUNTRACED | WCONTINUED)) && child->stopsig)))
return false; return false;
parent_w->next = w->next; /* successful wait. remove from wait queue */ parent_w->next = w->next; /* successful wait. remove from wait queue */
@ -1059,6 +1059,9 @@ stopped_or_terminated (waitq *parent_w, _pinfo *child)
if (!terminated) if (!terminated)
{ {
sigproc_printf ("stopped child"); sigproc_printf ("stopped child");
if (child->stopsig == SIGCONT)
w->status = __W_CONTINUED;
else
w->status = (child->stopsig << 8) | 0x7f; w->status = (child->stopsig << 8) | 0x7f;
child->stopsig = 0; child->stopsig = 0;
} }

2
winsup/cygwin/wait.cc
View File

@ -52,7 +52,7 @@ wait4 (int intpid, int *status, int options, struct rusage *r)
while (1) while (1)
{ {
sig_dispatch_pending (); sig_dispatch_pending ();
if (options & ~(WNOHANG | WUNTRACED)) if (options & ~(WNOHANG | WUNTRACED | WCONTINUED))
{ {
set_errno (EINVAL); set_errno (EINVAL);
res = -1; res = -1;