JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* child_info.h: Reset magic number.

Browse Source 
(child_info_spawn::wait_for_myself): Move function to sigproc.cc.
* pinfo.cc (is_toplevel_proc): Delete unneeded variable.
* sigproc.cc (child_info_spawn::wait_for_myself): Move function from header to
here.  Do all setup required to properly wait for top-level execed process to
exit.
* spawn.cc (child_info_spawn::worker): Attempt to properly handle _P_DETACH.
Set wr_proc_pipe if top-level process even when execing.  Just call
wait_for_myself() to...  wait for myself.  Don't call cleanup twice.
This commit is contained in:
Christopher Faylor 2012-03-21 05:23:13 +00:00
parent e102a69b3d
commit 6daf4afb11
5 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,16 @@
2012-03-21 Christopher Faylor <me.cygwin2012@cgf.cx>
* child_info.h: Reset magic number.
(child_info_spawn::wait_for_myself): Move function to sigproc.cc.
* pinfo.cc (is_toplevel_proc): Delete unneeded variable.
* sigproc.cc (child_info_spawn::wait_for_myself): Move function from
header to here. Do all setup required to properly wait for top-level
execed process to exit.
* spawn.cc (child_info_spawn::worker): Attempt to properly handle
_P_DETACH. Set wr_proc_pipe if top-level process even when execing.
Just call wait_for_myself() to... wait for myself. Don't call cleanup
twice.
2012-03-21 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-03-21 Christopher Faylor <me.cygwin2012@cgf.cx>
* pinfo.cc (proc_waiter): Remove debugging. * pinfo.cc (proc_waiter): Remove debugging.

4
winsup/cygwin/child_info.h
View File

@ -35,7 +35,7 @@ enum child_status
#define EXEC_MAGIC_SIZE sizeof(child_info) #define EXEC_MAGIC_SIZE sizeof(child_info)
/* Change this value if you get a message indicating that it is out-of-sync. */ /* Change this value if you get a message indicating that it is out-of-sync. */
#define CURR_CHILD_INFO_MAGIC 0xa49e665eU #define CURR_CHILD_INFO_MAGIC 0x4a52da7eU
#define NPROCS 256 #define NPROCS 256
@ -158,7 +158,7 @@ public:
return true; return true;
} }
} }
void wait_for_myself () { WaitForSingleObject (ev, INFINITE); } void wait_for_myself ();
bool has_execed () const bool has_execed () const
{ {
if (hExeced) if (hExeced)

2
winsup/cygwin/pinfo.cc
View File

@ -49,8 +49,6 @@ pinfo_basic myself_initial NO_COPY;
pinfo NO_COPY myself (static_cast<_pinfo *> (&myself_initial)); // Avoid myself != NULL checks pinfo NO_COPY myself (static_cast<_pinfo *> (&myself_initial)); // Avoid myself != NULL checks
bool is_toplevel_proc;
/* Setup the pinfo structure for this process. There may already be a /* Setup the pinfo structure for this process. There may already be a
_pinfo for this "pid" if h != NULL. */ _pinfo for this "pid" if h != NULL. */

10
winsup/cygwin/sigproc.cc
View File

@ -911,6 +911,16 @@ cygheap_exec_info::alloc ()
+ (nprocs * sizeof (children[0]))); + (nprocs * sizeof (children[0])));
} }
void
child_info_spawn::wait_for_myself ()
{
myself.set_rd_proc_pipe (rd_proc_pipe);
ForceCloseHandle (wr_proc_pipe);
wr_proc_pipe = NULL;
myself.remember (false);
WaitForSingleObject (ev, INFINITE);
}
void void
child_info::cleanup () child_info::cleanup ()
{ {

16
winsup/cygwin/spawn.cc
View File

@ -614,10 +614,12 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
c_flags |= CREATE_NEW_PROCESS_GROUP; c_flags |= CREATE_NEW_PROCESS_GROUP;
refresh_cygheap (); refresh_cygheap ();
if (chtype == _CH_EXEC) if (mode == _P_DETACH)
wr_proc_pipe = my_wr_proc_pipe; /* all set */;
else else if (chtype != _CH_EXEC || !my_wr_proc_pipe)
prefork (); prefork ();
else
wr_proc_pipe = my_wr_proc_pipe;
/* When ruid != euid we create the new process under the current original /* When ruid != euid we create the new process under the current original
account and impersonate in child, this way maintaining the different account and impersonate in child, this way maintaining the different
@ -853,14 +855,8 @@ loop:
close_all_files (true); close_all_files (true);
if (!my_wr_proc_pipe if (!my_wr_proc_pipe
&& WaitForSingleObject (pi.hProcess, 0) == WAIT_TIMEOUT) && WaitForSingleObject (pi.hProcess, 0) == WAIT_TIMEOUT)
{ wait_for_myself ();
extern bool is_toplevel_proc;
is_toplevel_proc = true;
myself.remember (false);
wait_for_myself ();
}
} }
this->cleanup ();
myself.exit (EXITCODE_NOSET); myself.exit (EXITCODE_NOSET);
break; break;
case _P_WAIT: case _P_WAIT: