mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-29 02:20:21 +08:00
44d2fc0a45
* child_info.h: Redefine CURR_CHILD_INFO_MAGIC. (child_info_fork::abort): Rename from handle_failure. Change arguments. * cygtls.h (_local_storage::ttybuf): New field. * dcrt0.cc (vapi_fatal): Split api_fatal. Add "in forked process" to message when appropriate. (api_fatal): Use vapi_fatal. * devices.h: Make multiple inclusion safe. (fh_devices): Add FH_CONS* stuff. Reorder slightly. (device): Eliminate anonymous union. Add more ways to access minor/major. (device::setunit): Accommodate no-longer-anonymous union. (device::is_fs): Ditto. (device::is_fs_special): Ditto. (device::major): New function. (device::minor): Ditto. (device::is_device): New function. (device::not_device): Ditto. (device::operator int): New operator. (device::operator fh_devices): Ditto. (device::operator bool): Ditto. (device::operator DWORD): Ditto. (device::operator =): Ditto. (isproc_dev): New function. (isprocsys_dev): Ditto. (iscons_dev): Ditto. (istty_slave_dev): Ditto. * devices.in: Add new "/dev/cons*" strings. Accommodate no-longer-anonymous union throughout. (BRACK): Use more precise method for initialization. * devices.cc: Regenerate. * dtable.cc (dtable::stdio_init): Use get_cttyp instead of get_tty. (dtable::find_archetype): Use new DWORD operator in device to test archetypes. (dtable::init_std_file_from_handle): Use different method to initialize 'dev'. Adapt to different ctty handling and accommodate /dev/cons*. (fh_alloc): Accommodate no-longer-anonymous union. Adapt to new /dev/cons*. (build_fh_pc): Make debugging output more useful. * exceptions.cc (ctrl_c_handler): Use get_cttyp instead of get_tty. * external.cc (fillout_pinfo): Accommodate new cons* stuff. * fhandler.cc (fhandler_base::read): Eliminate is_slow() test. * fhandler.h (fhandler_base::*): Adapt to changes in device.h. (fhandler_*::is_slow): Delete. ( fhandler_proc::get_proc_fhandler): Return fh_devices type. * fhandler_console.cc (open_shared_console): New function. (console_unit): New class. (console_unit::console_unit): New constructor. (enum_windows): New function. Declare as friend to console_unit. (fhandler_console::set_unit): New function. (fhandler_console::get_tty_stuff): Call set_unit to set the unit number and determine if initialization is needed. Eliminate flags parameter. (tty_list::get_cttyp): Rename (sorta) from get_tty. Return pointer to correct tty_min. (fhandler_console::open): Adapt to elimination of argument to get_tty_stuff. (fhandler_console::output_tcsetattr): Properly detect error condition. (fhandler_console::fixup_after_fork_exec): Adapt to get_tty_stuff() setting tc automatically. * fhandler_proc.cc: Use FH_BAD rather than 0 throughout where using fh_devices enum. (fhandler_proc::get_proc_fhandler): Return fh_devices. Adapt to devices.h changes. * fhandler_process.cc: Adapt to devices.h changes. Use FH_BAD rather than 0 throughout where using fh_devices enum. * fhandler_procnet.cc: Ditto. * fhandler_procsys.cc: Ditto. * fhandler_procsysvipc.cc: Ditto. * fhandler_tape.cc (fhandler_dev_tape::fhandler_dev_tape): Ditto. * fhandler_termios.cc (handler_termios::bg_check): Use tc->ttyname() rather than assuming that we can construct a tty. * fhandler_tty.cc (fhandler_tty_master::fhandler_tty_master): Just return get_minor() of dev. (fhandler_pty_master::process_slave_output): Add slightly more debugging info. (fhandler_tty_slave::fhandler_tty_slave): Change name from ntty to unit. (fhandler_pty_master::open): Ditto. (fhandler_tty_slave::ioctl): Adapt to change which causes ctty to represent a complete device. (fhandler_tty_master::init_console): Add debugging for failure path. (fhandler_pty_master::setup): Use get_unit() to retrieve unit number rather than relying on raw ntty. (fhandler_pty_master::setup): Ditto. * fhandler_virtual.h (virt_tab_t): Redefine fhandler as fh_devices. * fork.cc: Remove obsolete vfork stuff. (frok::child): Don't assume that a ctty == 0 is valid. * mount.cc (mount_info::conv_to_win32_path): Adapt to device struct changes. (mount_info::conv_to_win32_path): Ditto. * path.cc (path_conv::check): Retrive major/minor numbers via a method rather than accessing them directly from device. Rely on dev operators to set/retrieve device information as required by device struct change. * path.h (isproc_dev): Move to devices.h. (isprocsys_dev): Ditto. (isvirtual_dev): Ditto. (path_conv:{isdevice,isfifo,isspecial,iscygdrive,issocket,get_devn,get_unitn}): Use device methods to access/manipulate devices. * pinfo.cc (pinfo::exit): Don't assume that ctty == 0 is valid. Use iscons_dev to determine if a device is a console. (_pinfo::_ctty): Use device::parse to generate tty/cons name. (_pinfo::set_ctty): Don't assume that ctty == 0 is valid. Remove redundant info from debugging. * shared.cc (offsets): Remove console offset. * shared_info.h (shared_locations): Ditto. * syscalls.cc (umask): Use device methods to manipulate device information. (ctermid): Use device::parse to generate term device name. * tlsoffsets.h: Regenerate. * tty.cc (ttyslot): Return minor number of ctty since ctty now represents a full device. (tty::create_master): Set ctty to a complete device. (tty_list::attach): Rework to detect new /dev/cons* stuff. (tty_list::terminate): Adapt to changes to ctty. (tty_list::init): Adapt to change to setntty - pass in device major number. (tty::exists): Use get_unit() to retrive tty unit number. (tty::open_mutex): Ditto. (tty::open_inuse): Ditto. (tty::create_inuse): Ditto. (tty::get_event): Ditto. (tty_min::ttyname): Define new function. * tty.h (tty_min::ntty): Redefine as fh_devices. (tty::exists): Use get_unit() to retrive tty unit number. (tty::open_mutex): Ditto. (tty::open_inuse): Ditto. (tty::create_inuse): Ditto. (tty::get_event): Ditto. (tty_min::ttyname): Declare new function. (tty::getntty): Declare as const. (tty_list::operator []): Assure that only minor part of argument is used. * dll_init.cc (dll_list::alloc): Detect mismatch of data segments early issuing an explicit error message if necessary. * heap.cc (heap_init): Adapt to changes from fork->handle_failure to fork->abort. * pinfo.h (EXITCODE_FORK_FAILED): New enum. (from Ryan Johnson) * sigproc.cc (child_info_fork::abort): Rename from handle_failure. Change arguments to allow passing in a printf-like message. * winsup.h (api_fatal): Delete macro definition. (api_fatal): Redefine from __api_fatal. (vapi_fatal): Declare new function. * include/sys/strace.h (strace_vprintf): Define new macro. * ntdll.h (_SYSTEM_INFORMATION_CLASS): Add SystemHandleInformation.
150 lines
4.0 KiB
C++
150 lines
4.0 KiB
C++
/* child_info.h: shared child info for cygwin
|
|
|
|
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2011
|
|
Red Hat, Inc.
|
|
|
|
This file is part of Cygwin.
|
|
|
|
This software is a copyrighted work licensed under the terms of the
|
|
Cygwin license. Please consult the file "CYGWIN_LICENSE" for
|
|
details. */
|
|
|
|
#include <setjmp.h>
|
|
|
|
enum child_info_types
|
|
{
|
|
_PROC_EXEC,
|
|
_PROC_SPAWN,
|
|
_PROC_FORK,
|
|
_PROC_WHOOPS
|
|
};
|
|
|
|
enum child_status
|
|
{
|
|
_CI_STRACED = 0x01,
|
|
_CI_ISCYGWIN = 0x02,
|
|
_CI_SAW_CTRL_C = 0x04
|
|
};
|
|
|
|
#define OPROC_MAGIC_MASK 0xff00ff00
|
|
#define OPROC_MAGIC_GENERIC 0xaf00f000
|
|
|
|
#define PROC_MAGIC_GENERIC 0xaf00fa00
|
|
|
|
#define PROC_EXEC (_PROC_EXEC)
|
|
#define PROC_SPAWN (_PROC_SPAWN)
|
|
#define PROC_FORK (_PROC_FORK)
|
|
|
|
#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 0x76ca2aaeU
|
|
|
|
/* NOTE: Do not make gratuitous changes to the names or organization of the
|
|
below class. The layout is checksummed to determine compatibility between
|
|
different cygwin versions. */
|
|
class child_info
|
|
{
|
|
public:
|
|
DWORD msv_count; // zeroed on < W2K3, set to pseudo-count on Vista
|
|
DWORD cb; // size of this record
|
|
DWORD intro; // improbable string
|
|
unsigned long magic; // magic number unique to child_info
|
|
unsigned short type; // type of record, exec, spawn, fork
|
|
HANDLE subproc_ready; // used for synchronization with parent
|
|
HANDLE user_h;
|
|
HANDLE parent;
|
|
init_cygheap *cygheap;
|
|
void *cygheap_max;
|
|
DWORD cygheap_reserve_sz;
|
|
unsigned char flag;
|
|
unsigned fhandler_union_cb;
|
|
int retry; // number of times we've tried to start child process
|
|
DWORD exit_code; // process exit code
|
|
static int retry_count;// retry count;
|
|
child_info (unsigned, child_info_types, bool);
|
|
child_info (): subproc_ready (NULL), parent (NULL) {}
|
|
~child_info ();
|
|
void ready (bool);
|
|
bool sync (int, HANDLE&, DWORD) __attribute__ ((regparm (3)));
|
|
DWORD proc_retry (HANDLE) __attribute__ ((regparm (2)));
|
|
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 set_saw_ctrl_c () {flag |= _CI_SAW_CTRL_C;}
|
|
};
|
|
|
|
class mount_info;
|
|
class _pinfo;
|
|
|
|
class child_info_fork: public child_info
|
|
{
|
|
public:
|
|
HANDLE forker_finished;// for synchronization with child
|
|
jmp_buf jmp; // where child will jump to
|
|
void *stackaddr; // address of parent stack
|
|
void *stacktop; // location of top of parent stack
|
|
void *stackbottom; // location of bottom of parent stack
|
|
size_t guardsize; // size of POSIX guard region or (size_t) -1 if
|
|
// user stack
|
|
char filler[4];
|
|
child_info_fork ();
|
|
void handle_fork () __attribute__ ((regparm (1)));;
|
|
bool abort (const char *fmt = NULL, ...);
|
|
void alloc_stack ();
|
|
void alloc_stack_hard_way (volatile char *);
|
|
};
|
|
|
|
class fhandler_base;
|
|
|
|
class cygheap_exec_info
|
|
{
|
|
public:
|
|
char *old_title;
|
|
int argc;
|
|
char **argv;
|
|
int envc;
|
|
char **envp;
|
|
HANDLE myself_pinfo;
|
|
};
|
|
|
|
class child_info_spawn: public child_info
|
|
{
|
|
public:
|
|
cygheap_exec_info *moreinfo;
|
|
int __stdin;
|
|
int __stdout;
|
|
char filler[4];
|
|
|
|
~child_info_spawn ()
|
|
{
|
|
if (moreinfo)
|
|
{
|
|
if (moreinfo->old_title)
|
|
cfree (moreinfo->old_title);
|
|
if (moreinfo->envp)
|
|
{
|
|
for (char **e = moreinfo->envp; *e; e++)
|
|
cfree (*e);
|
|
cfree (moreinfo->envp);
|
|
}
|
|
if (type != _PROC_SPAWN && moreinfo->myself_pinfo)
|
|
CloseHandle (moreinfo->myself_pinfo);
|
|
cfree (moreinfo);
|
|
}
|
|
}
|
|
child_info_spawn (): moreinfo (NULL) {};
|
|
child_info_spawn (child_info_types, bool);
|
|
void *operator new (size_t, void *p) __attribute__ ((nothrow)) {return p;}
|
|
void set (child_info_types ci, bool b) { new (this) child_info_spawn (ci, b);}
|
|
void handle_spawn () __attribute__ ((regparm (1)));
|
|
};
|
|
|
|
void __stdcall init_child_info (DWORD, child_info *, HANDLE);
|
|
|
|
extern "C" {
|
|
extern child_info *child_proc_info;
|
|
extern child_info_spawn *spawn_info asm ("_child_proc_info");
|
|
extern child_info_fork *fork_info asm ("_child_proc_info");
|
|
}
|