8cb359d947
* 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.
190 lines
4.7 KiB
C++
190 lines
4.7 KiB
C++
/* cygtls.h
|
|
|
|
Copyright 2003, 2004 Red Hat, Inc.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef _CYGTLS_H
|
|
#define _CYGTLS_H
|
|
|
|
#include <signal.h>
|
|
#include <pwd.h>
|
|
#include <grp.h>
|
|
#include <sys/time.h>
|
|
#define _NOMNTENT_FUNCS
|
|
#include <mntent.h>
|
|
#undef _NOMNTENT_FUNCS
|
|
#define USE_SYS_TYPES_FD_SET
|
|
#include <winsock.h>
|
|
|
|
#define CYGTLS_INITIALIZED 0x43227
|
|
#define CYGTLS_EXCEPTION (0x43227 + true)
|
|
|
|
#ifndef CYG_MAX_PATH
|
|
# define CYG_MAX_PATH 260
|
|
#endif
|
|
|
|
#ifndef UNLEN
|
|
# define UNLEN 256
|
|
#endif
|
|
|
|
#define TLS_STACK_SIZE 256
|
|
|
|
#include "cygthread.h"
|
|
|
|
#pragma pack(push,4)
|
|
struct _local_storage
|
|
{
|
|
/*
|
|
Needed for the group functions
|
|
*/
|
|
struct __group16 grp;
|
|
char *namearray[2];
|
|
int grp_pos;
|
|
|
|
/* console.cc */
|
|
unsigned rarg;
|
|
|
|
/* dlfcn.cc */
|
|
int dl_error;
|
|
char dl_buffer[256];
|
|
|
|
/* passwd.cc */
|
|
struct passwd res;
|
|
char pass[_PASSWORD_LEN];
|
|
int pw_pos;
|
|
|
|
/* path.cc */
|
|
struct mntent mntbuf;
|
|
int iteration;
|
|
unsigned available_drives;
|
|
char mnt_type[80];
|
|
char mnt_opts[80];
|
|
char mnt_fsname[CYG_MAX_PATH];
|
|
char mnt_dir[CYG_MAX_PATH];
|
|
|
|
/* select.cc */
|
|
SOCKET exitsock;
|
|
struct sockaddr_in exitsock_sin;
|
|
|
|
/* strerror */
|
|
char strerror_buf[20];
|
|
|
|
/* sysloc.cc */
|
|
char *process_ident;
|
|
int process_logopt;
|
|
int process_facility;
|
|
int process_logmask;
|
|
|
|
/* times.cc */
|
|
char timezone_buf[20];
|
|
struct tm _localtime_buf;
|
|
|
|
/* uinfo.cc */
|
|
char username[UNLEN + 1];
|
|
|
|
/* net.cc */
|
|
char *ntoa_buf;
|
|
struct protoent *protoent_buf;
|
|
struct servent *servent_buf;
|
|
struct hostent *hostent_buf;
|
|
char signamebuf[sizeof ("Unknown signal 4294967295 ")];
|
|
};
|
|
|
|
typedef struct struct_waitq
|
|
{
|
|
int pid;
|
|
int options;
|
|
int status;
|
|
HANDLE ev;
|
|
void *rusage; /* pointer to potential rusage */
|
|
struct struct_waitq *next;
|
|
HANDLE thread_ev;
|
|
} waitq;
|
|
|
|
/* Changes to the below structure may require acompanying changes to the very
|
|
simple parser in the perl script 'gentls_offsets' (<<-- start parsing here).
|
|
The union in this structure is used to force alignment between the version
|
|
of the compiler used to generate tlsoffsets.h and the cygwin cross compiler.
|
|
*/
|
|
|
|
typedef __uint32_t __stack_t;
|
|
struct _cygtls
|
|
{
|
|
void (*func) /*gentls_offsets*/(int)/*gentls_offsets*/;
|
|
int saved_errno;
|
|
int sa_flags;
|
|
sigset_t oldmask;
|
|
sigset_t deltamask;
|
|
HANDLE event;
|
|
int *errno_addr;
|
|
unsigned initialized;
|
|
sigset_t sigmask;
|
|
sigset_t sigwait_mask;
|
|
siginfo_t *sigwait_info;
|
|
unsigned threadkill;
|
|
siginfo_t infodata;
|
|
struct pthread *tid;
|
|
union
|
|
{
|
|
struct _reent local_clib;
|
|
char __dontuse[8 * ((sizeof(struct _reent) + 4) / 8)];
|
|
};
|
|
struct _local_storage locals;
|
|
class cygthread *_ctinfo;
|
|
waitq wq;
|
|
struct _cygtls *prev, *next;
|
|
__stack_t *stackptr;
|
|
int sig;
|
|
unsigned incyg;
|
|
unsigned spinning;
|
|
unsigned stacklock;
|
|
__stack_t stack[TLS_STACK_SIZE];
|
|
unsigned padding[0];
|
|
|
|
/*gentls_offsets*/
|
|
static CRITICAL_SECTION protect_linked_list;
|
|
static void init ();
|
|
void init_thread (void *, DWORD (*) (void *, void *));
|
|
static void call (DWORD (*) (void *, void *), void *);
|
|
static void call2 (DWORD (*) (void *, void *), void *, void *) __attribute__ ((regparm (3)));
|
|
static struct _cygtls *find_tls (int sig);
|
|
void remove (DWORD);
|
|
void push (__stack_t, bool) __attribute__ ((regparm (3)));
|
|
__stack_t pop () __attribute__ ((regparm (1)));
|
|
bool isinitialized () const {return initialized == CYGTLS_INITIALIZED || initialized == CYGTLS_EXCEPTION;}
|
|
bool in_exception () const {return initialized == CYGTLS_EXCEPTION;}
|
|
void set_state (bool);
|
|
void reset_exception ();
|
|
bool interrupt_now (CONTEXT *, int, void *, struct sigaction&)
|
|
__attribute__((regparm(3)));
|
|
void __stdcall interrupt_setup (int sig, void *handler,
|
|
struct sigaction& siga)
|
|
__attribute__((regparm(3)));
|
|
void init_threadlist_exceptions (struct _exception_list *);
|
|
operator HANDLE () const {return tid->win32_obj_id;}
|
|
void set_siginfo (struct sigpacket *) __attribute__ ((regparm (3)));
|
|
void set_threadkill () {threadkill = true;}
|
|
void reset_threadkill () {threadkill = false;}
|
|
int call_signal_handler () __attribute__ ((regparm (1)));
|
|
void remove_wq (DWORD) __attribute__ ((regparm (1)));
|
|
void fixup_after_fork () __attribute__ ((regparm (1)));
|
|
void lock () __attribute__ ((regparm (1)));
|
|
void unlock () __attribute__ ((regparm (1)));
|
|
bool locked () __attribute__ ((regparm (1)));
|
|
/*gentls_offsets*/
|
|
};
|
|
#pragma pack(pop)
|
|
|
|
extern char *_tlsbase __asm__ ("%fs:4");
|
|
extern char *_tlstop __asm__ ("%fs:8");
|
|
#define _my_tls (((_cygtls *) _tlsbase)[-1])
|
|
extern _cygtls *_main_tls;
|
|
|
|
#define __getreent() (&_my_tls.local_clib)
|
|
|
|
const int CYGTLS_PADSIZE = (((char *) _main_tls->padding) - ((char *) _main_tls));
|
|
#endif /*_CYGTLS_H*/
|