Throughout use "have_execed" macro rather than "hExeced" global handle.
Throughout rename _PROC_* to _CH_*. * child_info.h: Include "pinfo.h". (child_info_types): Rename _PROC_* -> _CH_* to avoid confusion with similarly named constants. (_PROC_*): Delete unneeded aliases. (PROC_*): Ditto. (CURR_CHILD_INFO_MAGIC): Ditto. (cchildren): Define using "pinfo_minimal". (child_info::set_saw_ctrl_c): Move to (child_info_spawn::set_saw_ctrl_c): Here. (child_info_spawn::lock): New field. (child_info_spawn::hExeced): Ditto. (child_info_spawn::ev): Ditto. (child_info_spawn::~child_info_spawn): Move to sigproc.cc. (child_info_spawn::child_info_spawn): Ditto. (child_info_spawn::cleanup): Declare new function. (child_info_spawn::set_saw_ctrl_c): Move to this class. Set flag only when execed and return true when we have set the flag. (child_info_spawn::child_info_spawn::signal_myself_exited): New function. (child_info_spawn::wait_for_myself): Ditto. (child_info_spawn::has_execed_cygwin): Ditto. (child_info_spawn::has_execed): Ditto. Replaces "hExeced" test. (child_info_spawn::operator HANDLE&): New operator. (child_info_spawn::worker): Define old "spawn_guts" as class member. (ch_spawn): Declare. (have_execed): Define. (have_execed_cygwin): Ditto. * cygheap.h: Update comment. * dcrt0.cc (get_cygwin_startup_info): Use _CH_* enums. (child_info_spawn::handle_spawn): Ditto. (dll_crt0_0): Ditto. (multiple_cygwin_problem): Ditto. * exceptions.cc (chExeced): Delete obsolete declaration. (ctrl_c_handler): Reference set_saw_ctrl_c via new ch_spawn global. * globals.cc (hExeced): Delete. * pinfo.cc (pinfo::thisproc): Refer to cygheap as ::cygheap for consistency in handle naming when -DDEBUGGING. (pinfo::init): Accommodate case where myself.h is known but h0 is passed in. (pinfo::pinfo): New constructor for setting up a pinfo passed in by previous exec'or. (pinfo::proc_waiter): Don't handle subprocess if we're in the process of exiting due to an exec of a cygwin process. Don't close rd_proc_pipe here. Close it when we actually are finished with the process. Use new ch_spawn.signal_myself_exited function to let exec stub know that subprocess has exited. (pinfo::wait): Clarify debugging output. (pinfo::release): Use "close_h" to close all handles to avoid races. (winpids::add): Assume that elements of the array do not need to be zeroed and are properly initialized or suffer problems on pinfo::release. Don't close hProcess since release does that now. * pinfo.h: Update comment. (pinfo_minimal): Move some elements from pinfo here so that child_info_spawn can use them. (pinfo): Inherit from pinfo_minimal. (pinfo::pinfo): Modify to accommodate new pinfo_minimal. (pinfo::allow_remove): New function. * sigproc.cc (proc_subproc): Use boolean values for true/false. Implement PROC_EXEC_CLEANUP. (proc_terminate): Set ppid = 1 since the procs list will only be iterated when the process has not execed. Don't do any cleanup here since it is now handled in pinfo::release. (sigproc_init): Initialize sync_proc_subproc earlier. (child_info::child_info): Assume that all important fields are properly initialized and avoid memset(). (child_info_spawn::child_info_spawn): Specifically test for execing and then set up appropriate fields in the struct. (child_info_spawn::cleanup): Define new function. (child_info_spawn::record_children): Specifically test for being execed here. Fill in pinfo_minimal part of children array. (child_info_spawn::reattach_children): Use constructor to duplicate information for previous exec'or. Add more debugging output. (remove_proc): Force deletion of thread when exiting due to exec. Rely on pinfo::cleanup in release. * sigproc.h (PROC_EXEC_CLEANUP): New enum. (PROC_DETACHED_CHILD): Delete. * spawn.cc (chExeced): Delete. (child_info_spawn::worker): Rename from spawn_guts. Use elements of child_info_spawn throughout rather than ch.whatever. Use ::cygheap to refer to global rather than element of child_info. Use wait_for_myself() rather than waitpid(). Call child_info_spawn::cleanup on function return. (spawnve): Reflect movement of spawn_guts functionality into child_info_spawn::worker. * syscalls.cc (popen): Ditto. * winsup.h (spawn_guts): Delete declaration.
This commit is contained in:
@@ -125,7 +125,7 @@ public:
|
||||
public:
|
||||
HANDLE wr_proc_pipe;
|
||||
DWORD wr_proc_pipe_owner;
|
||||
friend class pinfo;
|
||||
friend class pinfo_minimal;
|
||||
};
|
||||
|
||||
DWORD WINAPI commune_process (void *);
|
||||
@@ -136,22 +136,36 @@ enum parent_alerter
|
||||
__ALERT_ALIVE = 112
|
||||
};
|
||||
|
||||
class pinfo
|
||||
class pinfo_minimal
|
||||
{
|
||||
HANDLE h;
|
||||
_pinfo *procinfo;
|
||||
bool destroy;
|
||||
public:
|
||||
HANDLE rd_proc_pipe;
|
||||
HANDLE hProcess;
|
||||
HANDLE rd_proc_pipe;
|
||||
pinfo_minimal (): h (NULL), hProcess (NULL), rd_proc_pipe (NULL) {}
|
||||
friend class pinfo;
|
||||
};
|
||||
|
||||
class pinfo: public pinfo_minimal
|
||||
{
|
||||
bool destroy;
|
||||
_pinfo *procinfo;
|
||||
public:
|
||||
bool waiter_ready;
|
||||
class cygthread *wait_thread;
|
||||
|
||||
void init (pid_t, DWORD, HANDLE) __attribute__ ((regparm(3)));
|
||||
pinfo (): procinfo (NULL), rd_proc_pipe (NULL) {}
|
||||
pinfo (_pinfo *x): procinfo (x), rd_proc_pipe (NULL), hProcess (NULL) {}
|
||||
pinfo (pid_t n) : rd_proc_pipe (NULL), hProcess (NULL) {init (n, 0, NULL);}
|
||||
pinfo (pid_t n, DWORD flag) : rd_proc_pipe (NULL), hProcess (NULL), waiter_ready (0), wait_thread (NULL) {init (n, flag, NULL);}
|
||||
pinfo (_pinfo *x = NULL): pinfo_minimal (), destroy (false), procinfo (x),
|
||||
waiter_ready (false), wait_thread (NULL) {}
|
||||
pinfo (pid_t n, DWORD flag = 0): pinfo_minimal (), destroy (false),
|
||||
procinfo (NULL), waiter_ready (false),
|
||||
wait_thread (NULL)
|
||||
{
|
||||
init (n, flag, NULL);
|
||||
}
|
||||
pinfo (HANDLE, pinfo_minimal&, pid_t);
|
||||
void thisproc (HANDLE) __attribute__ ((regparm (2)));
|
||||
inline void _pinfo_release ();
|
||||
void release ();
|
||||
bool wait () __attribute__ ((regparm (1)));
|
||||
~pinfo ()
|
||||
@@ -172,6 +186,7 @@ public:
|
||||
_pinfo *operator * () const {return procinfo;}
|
||||
operator _pinfo * () const {return procinfo;}
|
||||
void preserve () { destroy = false; }
|
||||
void allow_remove () { destroy = true; }
|
||||
#ifndef _SIGPROC_H
|
||||
int reattach () {system_printf ("reattach is not here"); return 0;}
|
||||
int remember () {system_printf ("remember is not here"); return 0;}
|
||||
@@ -255,9 +270,9 @@ public:
|
||||
|
||||
#define _P_VFORK 0
|
||||
#define _P_SYSTEM 512
|
||||
/* Add this flag in calls to spawn_guts if the calling function is one of
|
||||
'p' type functions: execlp, execvp, spawnlp, spawnvp. Per POSIX, only
|
||||
these p-type functions fall back to call /bin/sh if the file is not a
|
||||
/* Add this flag in calls to child_info_spawn::worker if the calling function
|
||||
is one of 'p' type functions: execlp, execvp, spawnlp, spawnvp. Per POSIX,
|
||||
only these p-type functions fall back to call /bin/sh if the file is not a
|
||||
binary. The setting of _P_PATH_TYPE_EXEC is used as a bool value in
|
||||
av::fixup to decide if the file should be evaluated as a script, or if
|
||||
ENOEXEC should be returned. */
|
||||
|
Reference in New Issue
Block a user