Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/winsup/cygwin/sigproc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin/sigproc.cc')
-rw-r--r--winsup/cygwin/sigproc.cc99
1 files changed, 36 insertions, 63 deletions
diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index d893fc2d8..5acc584c6 100644
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -23,7 +23,6 @@ details. */
#include "shared_info.h"
#include "cygtls.h"
#include "ntdll.h"
-#include "exception.h"
/*
* Convenience defines
@@ -43,10 +42,14 @@ int __sp_ln;
char NO_COPY myself_nowait_dummy[1] = {'0'};// Flag to sig_send that signal goes to
// current process but no wait is required
+HANDLE NO_COPY signal_arrived; // Event signaled when a signal has
+ // resulted in a user-specified
+ // function call
#define Static static NO_COPY
-Static HANDLE sig_hold; // Used to stop signal processing
+HANDLE NO_COPY sigCONT; // Used to "STOP" a process
+
Static bool sigheld; // True if holding signals
Static int nprocs; // Number of deceased children
@@ -370,6 +373,8 @@ close_my_readsig ()
void
_cygtls::signal_exit (int rc)
{
+ extern void stackdump (DWORD, int, bool);
+
HANDLE myss = my_sendsig;
my_sendsig = NULL; /* Make no_signals_allowed return true */
@@ -409,7 +414,7 @@ _cygtls::signal_exit (int rc)
}
if ((rc & 0x80) && !try_to_debug ())
- stackdump (thread_context.ebp, true);
+ stackdump (thread_context.ebp, 1, 1);
lock_process until_exit (true);
if (have_execed || exit_state > ES_PROCESS_LOCKED)
@@ -441,19 +446,10 @@ proc_terminate ()
/* Clean out proc processes from the pid list. */
for (int i = 0; i < nprocs; i++)
{
- /* If we've execed then the execed process will handle setting ppid
- to 1 iff it is a Cygwin process. */
- if (!have_execed || !have_execed_cygwin)
- procs[i]->ppid = 1;
+ procs[i]->ppid = 1;
if (procs[i].wait_thread)
procs[i].wait_thread->terminate_thread ();
- /* Release memory associated with this process unless it is 'myself'.
- 'myself' is only in the procs table when we've execed. We reach
- here when the next process has finished initializing but we still
- can't free the memory used by 'myself' since it is used later on
- during cygwin tear down. */
- if (procs[i] != myself)
- procs[i].release ();
+ procs[i].release ();
}
nprocs = 0;
sync_proc_subproc.release ();
@@ -514,6 +510,17 @@ sig_dispatch_pending (bool fast)
sig_send (myself, fast ? __SIGFLUSHFAST : __SIGFLUSH);
}
+void __stdcall
+create_signal_arrived ()
+{
+ if (signal_arrived)
+ return;
+ /* local event signaled when main thread has been dispatched
+ to a signal handler function. */
+ signal_arrived = CreateEvent (&sec_none_nih, false, false, NULL);
+ ProtectHandle (signal_arrived);
+}
+
/* Signal thread initialization. Called from dll_crt0_1.
This routine starts the signal handling thread. */
void __stdcall
@@ -522,8 +529,7 @@ sigproc_init ()
char char_sa_buf[1024];
PSECURITY_ATTRIBUTES sa = sec_user_nih ((PSECURITY_ATTRIBUTES) char_sa_buf, cygheap->user.sid());
DWORD err = fhandler_pipe::create (sa, &my_readsig, &my_sendsig,
- sizeof (sigpacket), "sigwait",
- PIPE_ADD_PID);
+ sizeof (sigpacket), NULL, 0);
if (err)
{
SetLastError (err);
@@ -567,7 +573,7 @@ sig_send (_pinfo *p, int sig)
return 0;
else if (sig == __SIGNOHOLD || sig == __SIGEXIT)
{
- SetEvent (sig_hold);
+ SetEvent (sigCONT);
sigheld = false;
}
else if (&_my_tls == _main_tls)
@@ -823,8 +829,7 @@ child_info::child_info (unsigned in_cb, child_info_types chtype,
bool need_subproc_ready):
cb (in_cb), intro (PROC_MAGIC_GENERIC), magic (CHILD_INFO_MAGIC),
type (chtype), cygheap (::cygheap), cygheap_max (::cygheap_max),
- flag (0), retry (child_info::retry_count), rd_proc_pipe (NULL),
- wr_proc_pipe (NULL)
+ flag (0), retry (child_info::retry_count)
{
/* It appears that when running under WOW64 on Vista 64, the first DWORD
value in the datastructure lpReserved2 is pointing to (msv_count in
@@ -872,12 +877,14 @@ child_info::child_info (unsigned in_cb, child_info_types chtype,
child_info::~child_info ()
{
- cleanup ();
+ if (subproc_ready)
+ CloseHandle (subproc_ready);
+ if (parent)
+ CloseHandle (parent);
}
child_info_fork::child_info_fork () :
- child_info (sizeof *this, _CH_FORK, true),
- forker_finished (NULL)
+ child_info (sizeof *this, _CH_FORK, true)
{
}
@@ -887,7 +894,7 @@ child_info_spawn::child_info_spawn (child_info_types chtype, bool need_subproc_r
if (type == _CH_EXEC)
{
hExeced = NULL;
- if (my_wr_proc_pipe)
+ if (myself->wr_proc_pipe)
ev = NULL;
else if (!(ev = CreateEvent (&sec_none_nih, false, false, NULL)))
api_fatal ("couldn't create signalling event for exec, %E");
@@ -907,39 +914,6 @@ cygheap_exec_info::alloc ()
}
void
-child_info_spawn::wait_for_myself ()
-{
- postfork (myself);
- myself.remember (false);
- WaitForSingleObject (ev, INFINITE);
-}
-
-void
-child_info::cleanup ()
-{
- if (subproc_ready)
- {
- CloseHandle (subproc_ready);
- subproc_ready = NULL;
- }
- if (parent)
- {
- CloseHandle (parent);
- parent = NULL;
- }
- if (rd_proc_pipe)
- {
- ForceCloseHandle (rd_proc_pipe);
- rd_proc_pipe = NULL;
- }
- if (wr_proc_pipe)
- {
- ForceCloseHandle (wr_proc_pipe);
- wr_proc_pipe = NULL;
- }
-}
-
-void
child_info_spawn::cleanup ()
{
if (moreinfo)
@@ -967,7 +941,6 @@ child_info_spawn::cleanup ()
sync_proc_subproc.release ();
}
type = _CH_NADA;
- child_info::cleanup ();
}
/* Record any non-reaped subprocesses to be passed to about-to-be-execed
@@ -1075,7 +1048,7 @@ child_info::sync (pid_t pid, HANDLE& hProcess, DWORD howlong)
{
res = true;
exit_code = STILL_ACTIVE;
- if (type == _CH_EXEC && my_wr_proc_pipe)
+ if (type == _CH_EXEC && myself->wr_proc_pipe)
{
ForceCloseHandle1 (hProcess, childhProc);
hProcess = NULL;
@@ -1139,10 +1112,10 @@ child_info_fork::abort (const char *fmt, ...)
va_list ap;
va_start (ap, fmt);
strace_vprintf (SYSTEM, fmt, ap);
- TerminateProcess (GetCurrentProcess (), EXITCODE_FORK_FAILED);
+ ExitProcess (EXITCODE_FORK_FAILED);
}
if (retry > 0)
- TerminateProcess (GetCurrentProcess (), EXITCODE_RETRY);
+ ExitProcess (EXITCODE_RETRY);
return false;
}
@@ -1218,7 +1191,7 @@ stopped_or_terminated (waitq *parent_w, _pinfo *child)
int might_match;
waitq *w = parent_w->next;
- sigproc_printf ("considering pid %d, pgid %d, w->pid %d", child->pid, child->pgid, w->pid);
+ sigproc_printf ("considering pid %d", child->pid);
if (w->pid == -1)
might_match = 1;
else if (w->pid == 0)
@@ -1344,7 +1317,7 @@ static void WINAPI
wait_sig (VOID *)
{
_sig_tls = &_my_tls;
- sig_hold = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
+ sigCONT = CreateEvent (&sec_none_nih, FALSE, FALSE, NULL);
sigproc_printf ("entering ReadFile loop, my_readsig %p, my_sendsig %p",
my_readsig, my_sendsig);
@@ -1354,7 +1327,7 @@ wait_sig (VOID *)
for (;;)
{
if (pack.si.si_signo == __SIGHOLD)
- WaitForSingleObject (sig_hold, INFINITE);
+ WaitForSingleObject (sigCONT, INFINITE);
DWORD nb;
pack.tls = NULL;
if (!ReadFile (my_readsig, &pack, sizeof (pack), &nb, NULL))
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 06:49:18 +0300