diff options
Diffstat (limited to 'winsup/cygwin/child_info.h')
| -rw-r--r-- | winsup/cygwin/child_info.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h index eac40c247..1dfa51bf5 100644 --- a/winsup/cygwin/child_info.h +++ b/winsup/cygwin/child_info.h @@ -1,6 +1,6 @@ /* child_info.h: shared child info for cygwin - Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2011, 2012 + Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2011 Red Hat, Inc. This file is part of Cygwin. @@ -35,7 +35,7 @@ enum child_status #define EXEC_MAGIC_SIZE sizeof(child_info) /* Change this value if you get a message indicating that it is out-of-sync. */ -#define CURR_CHILD_INFO_MAGIC 0xf1378eabU +#define CURR_CHILD_INFO_MAGIC 0x76041b78U #define NPROCS 256 @@ -61,12 +61,9 @@ public: void *cygheap_max; unsigned char flag; int retry; // number of times we've tried to start child process - HANDLE rd_proc_pipe; - HANDLE wr_proc_pipe; HANDLE subproc_ready; // used for synchronization with parent HANDLE user_h; HANDLE parent; - DWORD parent_winpid; DWORD cygheap_reserve_sz; unsigned fhandler_union_cb; DWORD exit_code; // process exit code @@ -81,18 +78,10 @@ public: bool isstraced () const {return !!(flag & _CI_STRACED);} bool iscygwin () const {return !!(flag & _CI_ISCYGWIN);} bool saw_ctrl_c () const {return !!(flag & _CI_SAW_CTRL_C);} - void prefork (bool = false); - void cleanup (); - void postfork (pinfo& child) - { - ForceCloseHandle (wr_proc_pipe); - wr_proc_pipe = NULL; - child.set_rd_proc_pipe (rd_proc_pipe); - rd_proc_pipe = NULL; - } }; class mount_info; +class _pinfo; class child_info_fork: public child_info { @@ -165,7 +154,7 @@ public: return true; } } - void wait_for_myself (); + void wait_for_myself () { WaitForSingleObject (ev, INFINITE); } bool has_execed () const { if (hExeced) @@ -176,7 +165,6 @@ public: lock->release (); return !!hExeced; } - bool get_parent_handle (); bool has_execed_cygwin () const { return iscygwin () && has_execed (); } operator HANDLE& () {return hExeced;} int worker (const char *, const char *const *, const char *const [], int, |