From 8cb359d9470bc114ea767c99ab65bf603903f150 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 26 Nov 2004 04:15:10 +0000 Subject: * child_info.h (child_info_spawn::hexec_proc): Eliminate. * dcrt0.cc (dll_crt0_0): Remove hexec_proc stuff. * fork.cc (fork_child): Remove call to pinfo_fixup_after_fork. * pinfo.cc (set_myself): Close and zero pid_handle if set. (pinfo_fixup_after_fork): Delete. (proc_waiter): Don't close vchild.hProcess here. Do that when we are remove the vchild from procs. Save hProcess as pid_handle only on first reparent operation. (pinfo::wait): Don't set pid_handle here. (pinfo::alert_parent): Always try to send signal. If unsuccessful then close and zero wr_proc_pipe. * pinfo.h (pinfo::pinfo): Make sure that appropriate parts of the class are zeroed on construction. (pinfo::alert_parent): Take char argument. (pinfo_fixup_after_fork): Delete declaration. (hexec_proc): Ditto. * sigproc.cc (remove_proc): Close pid_handle and hProcess if appropriate. * spawn.cc (spawn_guts): Set cygheap->pid_handle on first exec. * cygheap.h (init_cygheap::pid_handle): New element. * pinfo.cc (set_myself): Clear previously existing cygheap->pid_handle when a new process has been started. (pinfo::wait): Make sure that a handle to the newly forked/spawned process is kept around so that the pid will not be reused. * pinfo.h (_pinfo::pid_handle): Move. (pinfo::pid_handle): to here. * spawn.cc (spawn_guts): Create a pid_handle in cygheap prior to spawning to ensure that the pid does not get reused during the lifetime of the "cygwin pid". * pinfo.h (pinfo::alert_parent): New function. * exceptions.cc (sig_handle_tty_stop): Use alert_parent to send "signals" to parent. * fork.cc (fork_parent): Don't close pi.hProcess. Let the waiter thread do that. * pinfo.cc (proc_waiter): Detect case where process exits without setting the exit code and use value from GetExitCodeProcess. Reluctantly implement __SIGREPARENT. (pinfo::alert_parent): Define. * sigproc.h (__SIGREPARENT): New enum. * spawn.cc (spawn_guts): Send reparent signal to parent on exec. Always create process in suspended state to avoid races. Remove cygthread.h in favor of cygtls.h throughout since cygtls now includes cygthread.h. Eliminate ppid_handle usage throughout. * child_info.h: Regenerate magic number (child_info): Remove pppid_handle. * cygthread.h (cygthread::release): New method. Frees thread without waiting. * cygthread.cc (cygthread::stub): Set _ctinfo in _mytls to point to information for executing thread. Don't call SetEvent if thread is no longer in use. (cygthread::simplestub): Ditto. * cygtls.h (_cygtls::_ctinfo): New element contains pointer to information about executing cygthread, if any. * dcrt0.cc: Remove last vestiges of per_thread stuff. (dll_crt0_0): Ditto. Remove accommodation for ppid_handle. (do_exit): Remove obsolete reparenting test. (_exit): Exit with a more SUSv3-like exit value. * dtable.cc (dtable::stdio_init): Check for myself->cygstarted rather than myself->ppid_handle to see if we were started by a cygwin process. * exceptions.cc (open_stackdumpfile): Ditto. (handle_exceptions): Ditto. (ctrl_c_handler): Ditto. (sig_handle_tty_stop): Ditto. Let parent send signal to itself on STOP. (sigpacket::process): Comment out vfork test. (signal_exit): Use more SUSv3-like exit value on signal. * external.cc (fillout_pinfo): Don't set hProcess. * fork.cc: Remove VFORK cruft. (per_thread::set): Delete. (fork_child): Remove perthread stuff. (fork_parent): Remove obsolete subproc_init. Accommodate new method for tracking subprocesses. * pinfo.cc (set_myself): Accommodate new pinfo/_pinfo layout. Set some things here that used to be set in wait_sig. (_pinfo::exit): Set exitcode here. Close process pipe. (_pinfo::commune_send): Accommodeate new pinfo/_pinfo layout. (proc_waiter): New function. Waits, in a thread for subprocess to go away. (pinfo::wait): New function. Initialization for proc_waiter. * pinfo.h (_pinfo::exitcode): New element. (_pinfo::cygstarted): Ditto. (_pinfo::wr_proc_pipe): Ditto. (_pinfo::ppid_handle): Delete. (_pinfo::hProcess): Delete. (_pinfo::lock): Delete. (pinfo::hProcess): New element. (pinfo::lock): Ditto. (pinfo::wait): Declare new function. (pinfo::preserve): Define new function. * sigproc.cc: Remove old stuff from wait_subproc thread based method. (zombies): Remove. (procs): New. (my_parent_is_alive): Just check that the parent pid exists. (mychild): Just use pinfo methods to determine if child is mine. (proc_subproc): Revamp PROC_ADDCHILD to use pinfo::wait. Remove PROC_CHILDTERMINATED logic. Use different method to remove processes from list when SIGCHLD == SIG_IGN. (proc_terminate): Gut. (subproc_init): Delete. (init_child_info): Remove setting of pppid_handle. (checkstate): Revamp to only scan procs array. (remove_proc): Rename from remove_zombie. Don't close hProcess or pid_handle. Don't release memory if it's myself. (stopped_or_terminated): Change logic to handle new consolidated proc/zombie array. (wait_subproc): Delete. * sigproc.h: Remove obsolete EXIT_* defines. (subproc_init): Remove declaration. * spawn.cc (spawn_guts): Remove reparenting stuff. Use standard wait logic to wait for child if started from a non-cygwin process. * tlsoffsets.h: Regenerate. * tty.cc (tty_init): Check for myself->cygstarted rather than myself->ppid_handle to see if we were started by a cygwin process. * include/sys/signal.h (external_pinfo::exitcode): Replace hProcess. * include/sys/wait.h (WCOREDUMP): Define. * fhandler_tty.cc (fhandler_tty_slave::read): Add debugging output for timeout case. * signal.cc (abort): Flag that we are exiting with the ABORT signal. --- winsup/cygwin/tlsoffsets.h | 114 +++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 55 deletions(-) (limited to 'winsup/cygwin/tlsoffsets.h') diff --git a/winsup/cygwin/tlsoffsets.h b/winsup/cygwin/tlsoffsets.h index e6b955c51..a99b38b66 100644 --- a/winsup/cygwin/tlsoffsets.h +++ b/winsup/cygwin/tlsoffsets.h @@ -1,113 +1,117 @@ //;# autogenerated: Do not edit. -//; $tls::sizeof__cygtls = 3932; -//; $tls::func = -3932; +//; $tls::sizeof__cygtls = 3936; +//; $tls::func = -3936; //; $tls::pfunc = 0; -//; $tls::saved_errno = -3928; +//; $tls::saved_errno = -3932; //; $tls::psaved_errno = 4; -//; $tls::sa_flags = -3924; +//; $tls::sa_flags = -3928; //; $tls::psa_flags = 8; -//; $tls::oldmask = -3920; +//; $tls::oldmask = -3924; //; $tls::poldmask = 12; -//; $tls::deltamask = -3916; +//; $tls::deltamask = -3920; //; $tls::pdeltamask = 16; -//; $tls::event = -3912; +//; $tls::event = -3916; //; $tls::pevent = 20; -//; $tls::errno_addr = -3908; +//; $tls::errno_addr = -3912; //; $tls::perrno_addr = 24; -//; $tls::initialized = -3904; +//; $tls::initialized = -3908; //; $tls::pinitialized = 28; -//; $tls::sigmask = -3900; +//; $tls::sigmask = -3904; //; $tls::psigmask = 32; -//; $tls::sigwait_mask = -3896; +//; $tls::sigwait_mask = -3900; //; $tls::psigwait_mask = 36; -//; $tls::sigwait_info = -3892; +//; $tls::sigwait_info = -3896; //; $tls::psigwait_info = 40; -//; $tls::threadkill = -3888; +//; $tls::threadkill = -3892; //; $tls::pthreadkill = 44; -//; $tls::infodata = -3884; +//; $tls::infodata = -3888; //; $tls::pinfodata = 48; -//; $tls::tid = -3736; +//; $tls::tid = -3740; //; $tls::ptid = 196; -//; $tls::local_clib = -3732; +//; $tls::local_clib = -3736; //; $tls::plocal_clib = 200; -//; $tls::__dontuse = -3732; +//; $tls::__dontuse = -3736; //; $tls::p__dontuse = 200; -//; $tls::locals = -2668; +//; $tls::locals = -2672; //; $tls::plocals = 1264; +//; $tls::_ctinfo = -1084; +//; $tls::p_ctinfo = 2852; //; $tls::wq = -1080; -//; $tls::pwq = 2852; +//; $tls::pwq = 2856; //; $tls::prev = -1052; -//; $tls::pprev = 2880; +//; $tls::pprev = 2884; //; $tls::next = -1048; -//; $tls::pnext = 2884; +//; $tls::pnext = 2888; //; $tls::stackptr = -1044; -//; $tls::pstackptr = 2888; +//; $tls::pstackptr = 2892; //; $tls::sig = -1040; -//; $tls::psig = 2892; +//; $tls::psig = 2896; //; $tls::incyg = -1036; -//; $tls::pincyg = 2896; +//; $tls::pincyg = 2900; //; $tls::spinning = -1032; -//; $tls::pspinning = 2900; +//; $tls::pspinning = 2904; //; $tls::stacklock = -1028; -//; $tls::pstacklock = 2904; +//; $tls::pstacklock = 2908; //; $tls::stack = -1024; -//; $tls::pstack = 2908; +//; $tls::pstack = 2912; //; $tls::padding = 0; -//; $tls::ppadding = 3932; +//; $tls::ppadding = 3936; //; __DATA__ -#define tls_func (-3932) +#define tls_func (-3936) #define tls_pfunc (0) -#define tls_saved_errno (-3928) +#define tls_saved_errno (-3932) #define tls_psaved_errno (4) -#define tls_sa_flags (-3924) +#define tls_sa_flags (-3928) #define tls_psa_flags (8) -#define tls_oldmask (-3920) +#define tls_oldmask (-3924) #define tls_poldmask (12) -#define tls_deltamask (-3916) +#define tls_deltamask (-3920) #define tls_pdeltamask (16) -#define tls_event (-3912) +#define tls_event (-3916) #define tls_pevent (20) -#define tls_errno_addr (-3908) +#define tls_errno_addr (-3912) #define tls_perrno_addr (24) -#define tls_initialized (-3904) +#define tls_initialized (-3908) #define tls_pinitialized (28) -#define tls_sigmask (-3900) +#define tls_sigmask (-3904) #define tls_psigmask (32) -#define tls_sigwait_mask (-3896) +#define tls_sigwait_mask (-3900) #define tls_psigwait_mask (36) -#define tls_sigwait_info (-3892) +#define tls_sigwait_info (-3896) #define tls_psigwait_info (40) -#define tls_threadkill (-3888) +#define tls_threadkill (-3892) #define tls_pthreadkill (44) -#define tls_infodata (-3884) +#define tls_infodata (-3888) #define tls_pinfodata (48) -#define tls_tid (-3736) +#define tls_tid (-3740) #define tls_ptid (196) -#define tls_local_clib (-3732) +#define tls_local_clib (-3736) #define tls_plocal_clib (200) -#define tls___dontuse (-3732) +#define tls___dontuse (-3736) #define tls_p__dontuse (200) -#define tls_locals (-2668) +#define tls_locals (-2672) #define tls_plocals (1264) +#define tls__ctinfo (-1084) +#define tls_p_ctinfo (2852) #define tls_wq (-1080) -#define tls_pwq (2852) +#define tls_pwq (2856) #define tls_prev (-1052) -#define tls_pprev (2880) +#define tls_pprev (2884) #define tls_next (-1048) -#define tls_pnext (2884) +#define tls_pnext (2888) #define tls_stackptr (-1044) -#define tls_pstackptr (2888) +#define tls_pstackptr (2892) #define tls_sig (-1040) -#define tls_psig (2892) +#define tls_psig (2896) #define tls_incyg (-1036) -#define tls_pincyg (2896) +#define tls_pincyg (2900) #define tls_spinning (-1032) -#define tls_pspinning (2900) +#define tls_pspinning (2904) #define tls_stacklock (-1028) -#define tls_pstacklock (2904) +#define tls_pstacklock (2908) #define tls_stack (-1024) -#define tls_pstack (2908) +#define tls_pstack (2912) #define tls_padding (0) -#define tls_ppadding (3932) +#define tls_ppadding (3936) -- cgit v1.2.3