* exceptions.cc (set_console_handler): Don't allocate
console_handler_thread_waiter. It is obsolete. (ctrl_c_handler): Don't use console_handler_thread_waiter. * path.cc (hash_path_name): Fix handling of relative names. Make case insensitive. * path.h (suffix_info): Use initializers. * pinfo.h (_pinfo): Avoid initializers for null case. * resource.cc (fill_rusage): Zero rest of rusage structure. * security.cc (set_process_privileges): Don't reopen parent process. Just use hMainProc. * signal.cc (signal): Track when a signal handler has been used. (sigaction): Ditto. * sigproc.cc (pchildren): Use default initializer. (zombies): Ditto. (sigproc_terminate): Avoid closing handles that will be closed on exit anyway. (wait_sig): Send signal to "parent" on EXECing, not FORKing. (wait_subproc): Send SIGCHLD here rather than in proc_wait to avoid potential muto conflicts. * sigproc.h (sigthread): Don't initialize to zero. It's the default. * spawn.cc (spawn_guts): Fill in resources from exec parent prior to termination. * sync.h (muto): Don't initialize to zero. * syscalls.cc (close_all_files): Use one lock around entire loop and call fhandler close/release stuff directly. (_read): Don't use ready_for_read if there are not signal handlers active. * dcrt0.cc (dll_crt0_1): Fix display of "title". (do_exit): Use pinfo exit method to exit. (__api_fatal): Ditto. * exceptions.cc (signal_exit): Ditto. * fork.cc (fork_child): Remove debugging stuff. Use pinfo_fixup_after fork in place of exec_fixup_after_fork. * pinfo.cc (pinfo_fixup_after_fork): New method. (pinfo_fixup_in_spawned_child): Ditto. (_pinfo::exit): New method. (_pinfo::init): Remove recursion. Detect pathological case where pinfo structure already exists for new pid. * pinfo.h (_pinfo): Reorganize slightly. Add new method and new function declarations. * sigproc.cc (proc_exists): Previous simplification was a little to simple. Try harder to detect if a process exists. (proc_terminate): Use PID_EXITED setting to determine if process is still around. (WFSO): Remove debugging statement. (WFMO): Ditto. * spawn.cc (exec_fixup_after_fork): Eliminate. (spawn_guts): Always set old_title to NULL. Is it really needed? Move hexec_proc to pinfo.cc. Call pinfo_fixup_in_spawned_child to eliminate handle link after a spawn. * include/sys/cygwin.h: Remove PID_NOT_IN_USE. Add PID_EXITED.
This commit is contained in:
@ -94,6 +94,13 @@ public:
|
||||
char root[MAX_PATH+1];
|
||||
size_t rootlen;
|
||||
|
||||
/* Resources used by process. */
|
||||
long start_time;
|
||||
struct rusage rusage_self;
|
||||
struct rusage rusage_children;
|
||||
/* Pointer to mmap'ed areas for this process. Set up by fork. */
|
||||
void *mmap_ptr;
|
||||
|
||||
/* Non-zero if process was stopped by a signal. */
|
||||
char stopsig;
|
||||
|
||||
@ -104,21 +111,13 @@ public:
|
||||
LONG* getsigtodo (int);
|
||||
HANDLE getthread2signal ();
|
||||
void setthread2signal (void *);
|
||||
|
||||
/* Resources used by process. */
|
||||
long start_time;
|
||||
struct rusage rusage_self;
|
||||
struct rusage rusage_children;
|
||||
void exit (UINT n) __attribute__ ((noreturn));
|
||||
|
||||
private:
|
||||
struct sigaction sigs[NSIG];
|
||||
sigset_t sig_mask; /* one set for everything to ignore. */
|
||||
LONG _sigtodo[NSIG + __SIGOFFSET];
|
||||
ThreadItem* thread2signal; // NULL means means thread any other means a pthread
|
||||
|
||||
public:
|
||||
/* Pointer to mmap'ed areas for this process. Set up by fork. */
|
||||
void *mmap_ptr;
|
||||
};
|
||||
|
||||
class pinfo
|
||||
@ -128,7 +127,7 @@ class pinfo
|
||||
int destroy;
|
||||
public:
|
||||
void init (pid_t n, DWORD create = 0, HANDLE h = NULL);
|
||||
pinfo (): h (NULL), procinfo (0), destroy (0) {}
|
||||
pinfo () {}
|
||||
pinfo (_pinfo *x): procinfo (x) {}
|
||||
pinfo (pid_t n) {init (n);}
|
||||
pinfo (pid_t n, int create) {init (n, create);}
|
||||
@ -181,7 +180,8 @@ extern pinfo myself;
|
||||
extern "C" int _spawnve (HANDLE hToken, int mode, const char *path,
|
||||
const char *const *argv, const char *const *envp);
|
||||
|
||||
extern void __stdcall exec_fixup_after_fork ();
|
||||
extern void __stdcall pinfo_fixup_after_fork ();
|
||||
extern void __stdcall pinfo_fixup_in_spawned_child (HANDLE hchild);
|
||||
|
||||
/* For mmaps across fork(). */
|
||||
int __stdcall recreate_mmaps_after_fork (void *);
|
||||
|
Reference in New Issue
Block a user