mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-29 02:20:21 +08:00
23771fa1f7
logs easier. Throughout, change /dev/tty* to /dev/pty*. Throughout, add flags argument to fhandler_*::dup methods. * devices.in: Rename (temporarily?) /dev/ttyN to /dev/ptyN. Add /dev/ptymN devices for pty masters. * devices.cc: Regenerate. * devices.h (MAX_CONSOLES): Set to max number supported by devices.in. (fh_devices::FH_PTMX): Rename from FH_PTYM. (device::operator int): Return by reference. * dtable.cc (fh_alloc): Take pc as an argument rather than just the device. This makes debugging easier since more information is available. Actually implement handling for already-allocated pty master devices. Make different decisions when generating fhandler for not-opened devices. Add kludge to deal with opening /dev/tty. (cnew_no_ctor): New macro. (build_fh_pc): Make debugging output more verbose. Use new clone() fhandler interface to duplicate archetypes. Reset last term opened. (dtable::dup_worker): Use Use new clone() fhandler interface to duplicate archetypes. Pass flags to child dup handler. (dtable::dup3): Set O_NOCTTY flag if newfd is not stdin/stdout/stderr. * fhandler.cc (fhandler_base::reset): Rename from operator =() and reduce functionality and sense of copy direction. (fhandler_base::open_with_arch): Use published interface to query io_handle(). Use new copyto() fhandler method to copy from/to found archetype. * fhandler.h: Throughout, delete size(), add copyout, clone, and fhandler_* (void *) methods. (fhandler_base::reset): Rename from operator =(). (fhandler_termios::is_dev_tty): Delete. (fhandler_termios): change "protected" region to "private". (fhandler_termios::is_dev_tty): Delete. (fhandler_termios): Rearrange protected/public. (fhandler_termios::fhandler_termios): Remember last fhandler_termios "opened". (fhandler_termios::~fhandler_termios): Forget last fhandler_termios opened. (ioctl): Rename from ioctl_termios. Take a void * argument. Reflect argument change in pinfo::set_ctty. (fhandler_console::dup): Declare new function. Set ctty here if appropriate. (fhandler_pty_master::from_master): Privatize. (fhandler_pty_master::to_master): Ditto. (fhandler_pty_master::dwProcessId): Ditto. (fhandler_pty_master::fhandler_pty_master): Add an `int' argument. (fhandler_pty_master::open_setup): Declare new function. (fhandler_pty_master::~fhandler_pty_master): Declare new method. (fhandler_nodevice): Remove commented out function declaration. * fhandler_console.cc: Use get_ttyp() instead of tc() throughout. (fhandler_console::dup): Define new function to set controlling ctty on dup, as appropriate. (fhandler_console::ioctl): Reflect ioctl_termios name change. (fhandler_console::setup): Rename from get_tty_stuff. (fhandler_console::open_setup): Reflect argument change in pinfo::set_ctty. (fhandler_console::fhandler_console): Set _tc here. * fhandler_termios.cc (handler_termios::ioctl): Rename. Take a void * arg like other ioctl functions. * fhandler_tty.cc (fhandler_pty_slave::dup): Call myself->set_ctty to potentially reset the controlling terminal. (fhandler_pty_slave::ioctl): Reflect name/arg change for ioctl_termios. (fhandler_pty_slave::fhandler_pty_slave): Take a "unit" argument. Call setup() here so that we will know the unit number of this fhandler as soon as possible. Set the unit as appropriate. (handler_pty_master::open): Move most stuff to constructor and open_setup. (handler_pty_slave::open_setup): Reflect argument change in pinfo::set_ctty. (handler_pty_master::open_setup): Define new function. (fhandler_pty_master::cleanup): Clear handles as a flag that the destructor does not have to do "close" operations. (fhandler_pty_master::close): Ditto. (fhandler_pty_master::~fhandler_pty_master): Define new method. (fhandler_pty_master::ioctl): Reflect name/arg change for ioctl_termios. (fhandler_pty_master::setup): Allocate tty here. Rely on handles being returned from allocated test rather than opening them here. Avoid setting _need_nl here since it is already zeroed in the constructor. Set up device information with DEV_TTYM_MAJOR. * path.h (path_conv &operator =): Take a const argument. (path_conv::dup): Ditto. (pathconv_arg::PC_OPEN): New enum. (pathconv_arg::PC_CTTY): Ditto. (path_types::PATH_CTTY): Ditto. (path_types::PATH_OPEN): Ditto. (path_conv::isopen): New method. (path_conv::isctty_capable): Ditto. * path.cc (path_conv::check): Set PATH_OPEN and PATH_CTTY as appropriate. * pipe.cc (fhandler_pipe::open): Use copyto to copy pipe handle. * syscall.cc (open): Reinstate fd > 2 check to disallow resetting ctty on non-std* handles. * tty.cc (tty_list::allocate): Pass out handles for allocated tty. use `not_allocated' to find unallocated ttys. Avoid keeping the lock since the allocation of the tty should be sufficient to prevent multiple access. (tty::not_allocated): Clarify comment. Rename. Return handles when an unused tty is found. Simply test for existing tty. (tty::exists): Rewrite to use `not_allocated'. * tty.h (NTTYS): Reset down to actual number supported by devices.in. (tty::not_allocated): Declare new function. (tty_list::allocate): Pass out read/write tty handles. Zero them when not found. * fhandler_proc.cc: Reflect name change from FH_PTYM -> FH_PTMX. * pinfo.h (pinfo::set_ctty): Reduce/reorder arguments passed in. * pinfo.cc (pinfo::set_ctty): Ditto. Just use tc() built into the passed-in fhandler_termios pointer. Return true if ctty is assigned. * syscalls.cc (open): Call build_fh_pc with PC_OPEN flag. Set PC_CTTY if appropriate. (stat_worker): Remove is_dev_tty () stuff.
273 lines
7.8 KiB
C++
273 lines
7.8 KiB
C++
/* pinfo.h: process table info
|
|
|
|
Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
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. */
|
|
|
|
#ifndef _PINFO_H
|
|
#define _PINFO_H
|
|
#include <sys/resource.h>
|
|
#include "thread.h"
|
|
|
|
struct commune_result
|
|
{
|
|
char *s;
|
|
int n;
|
|
HANDLE handles[2];
|
|
};
|
|
|
|
enum picom
|
|
{
|
|
PICOM_EXTRASTR = 0x80000000,
|
|
PICOM_CMDLINE = 1,
|
|
PICOM_CWD = 2,
|
|
PICOM_ROOT = 3,
|
|
PICOM_FDS = 4,
|
|
PICOM_FD = 5,
|
|
PICOM_PIPE_FHANDLER = 6
|
|
};
|
|
|
|
#define EXITCODE_SET 0x8000000
|
|
#define EXITCODE_NOSET 0x4000000
|
|
#define EXITCODE_RETRY 0x2000000
|
|
#define EXITCODE_OK 0x1000000
|
|
#define EXITCODE_FORK_FAILED 0x0800000
|
|
|
|
class fhandler_pipe;
|
|
|
|
class _pinfo
|
|
{
|
|
public:
|
|
/* Cygwin pid */
|
|
pid_t pid;
|
|
|
|
/* Various flags indicating the state of the process. See PID_
|
|
constants in <sys/cygwin.h>. */
|
|
DWORD process_state;
|
|
|
|
DWORD exitcode; /* set when process exits */
|
|
|
|
#define PINFO_REDIR_SIZE ((char *) &myself.procinfo->exitcode - (char *) myself.procinfo)
|
|
|
|
/* > 0 if started by a cygwin process */
|
|
DWORD cygstarted;
|
|
|
|
/* Parent process id. */
|
|
pid_t ppid;
|
|
|
|
/* dwProcessId contains the processid used for sending signals. It
|
|
will be reset in a child process when it is capable of receiving
|
|
signals. */
|
|
DWORD dwProcessId;
|
|
|
|
/* Used to spawn a child for fork(), among other things. The other
|
|
members of _pinfo take only a bit over 200 bytes. So cut off a
|
|
couple of bytes from progname to allow the _pinfo structure not
|
|
to exceed 64K. Otherwise it blocks another 64K block of VM for
|
|
the process. */
|
|
WCHAR progname[NT_MAX_PATH - 512];
|
|
|
|
/* User information.
|
|
The information is derived from the GetUserName system call,
|
|
with the name looked up in /etc/passwd and assigned a default value
|
|
if not found. This data resides in the shared data area (allowing
|
|
tasks to store whatever they want here) so it's for informational
|
|
purposes only. */
|
|
__uid32_t uid; /* User ID */
|
|
__gid32_t gid; /* Group ID */
|
|
pid_t pgid; /* Process group ID */
|
|
pid_t sid; /* Session ID */
|
|
int ctty; /* Control tty */
|
|
bool has_pgid_children;/* True if we've forked or spawned children with our GID. */
|
|
|
|
/* Resources used by process. */
|
|
long start_time;
|
|
struct rusage rusage_self;
|
|
struct rusage rusage_children;
|
|
int nice;
|
|
|
|
/* Non-zero if process was stopped by a signal. */
|
|
char stopsig;
|
|
|
|
inline void set_has_pgid_children ()
|
|
{
|
|
if (pgid == pid)
|
|
has_pgid_children = 1;
|
|
}
|
|
|
|
inline void set_has_pgid_children (bool val) {has_pgid_children = val;}
|
|
|
|
commune_result commune_request (__uint32_t, ...);
|
|
bool alive ();
|
|
fhandler_pipe *pipe_fhandler (HANDLE, size_t &);
|
|
char *fd (int fd, size_t &);
|
|
char *fds (size_t &);
|
|
char *root (size_t &);
|
|
char *cwd (size_t &);
|
|
char *cmdline (size_t &);
|
|
bool set_ctty (class fhandler_termios *, int);
|
|
HANDLE dup_proc_pipe (HANDLE) __attribute__ ((regparm(2)));
|
|
void sync_proc_pipe ();
|
|
bool alert_parent (char);
|
|
int __stdcall kill (siginfo_t&) __attribute__ ((regparm (2)));
|
|
bool __stdcall exists () __attribute__ ((regparm (1)));
|
|
const char *_ctty (char *);
|
|
|
|
/* signals */
|
|
HANDLE sendsig;
|
|
HANDLE exec_sendsig;
|
|
DWORD exec_dwProcessId;
|
|
public:
|
|
HANDLE wr_proc_pipe;
|
|
DWORD wr_proc_pipe_owner;
|
|
friend class pinfo;
|
|
};
|
|
|
|
DWORD WINAPI commune_process (void *);
|
|
|
|
enum parent_alerter
|
|
{
|
|
__ALERT_REPARENT = 111, // arbitrary non-signal value
|
|
__ALERT_ALIVE = 112
|
|
};
|
|
|
|
class pinfo
|
|
{
|
|
HANDLE h;
|
|
_pinfo *procinfo;
|
|
bool destroy;
|
|
public:
|
|
HANDLE rd_proc_pipe;
|
|
HANDLE hProcess;
|
|
bool waiter_ready;
|
|
class cygthread *wait_thread;
|
|
void init (pid_t, DWORD, HANDLE) __attribute__ ((regparm(3)));
|
|
pinfo (): procinfo (NULL) {}
|
|
pinfo (_pinfo *x): procinfo (x), 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);}
|
|
void thisproc (HANDLE) __attribute__ ((regparm (2)));
|
|
void release ();
|
|
int wait () __attribute__ ((regparm (1)));
|
|
~pinfo ()
|
|
{
|
|
if (destroy && procinfo)
|
|
release ();
|
|
}
|
|
void exit (DWORD n) __attribute__ ((noreturn, regparm(2)));
|
|
void maybe_set_exit_code_from_windows () __attribute__ ((regparm(1)));
|
|
void set_exit_code (DWORD n) __attribute__ ((regparm(2)));
|
|
_pinfo *operator -> () const {return procinfo;}
|
|
int operator == (pinfo *x) const {return x->procinfo == procinfo;}
|
|
int operator == (pinfo &x) const {return x.procinfo == procinfo;}
|
|
int operator == (_pinfo *x) const {return x == procinfo;}
|
|
int operator == (void *x) const {return procinfo == x;}
|
|
int operator == (int x) const {return (int) procinfo == (int) x;}
|
|
int operator == (char *x) const {return (char *) procinfo == x;}
|
|
_pinfo *operator * () const {return procinfo;}
|
|
operator _pinfo * () const {return procinfo;}
|
|
void preserve () { destroy = false; }
|
|
#ifndef _SIGPROC_H
|
|
int remember () {system_printf ("remember is not here"); return 0;}
|
|
#else
|
|
int remember (bool detach)
|
|
{
|
|
int res = proc_subproc (detach ? PROC_DETACHED_CHILD : PROC_ADDCHILD,
|
|
(DWORD) this);
|
|
destroy = res ? false : true;
|
|
return res;
|
|
}
|
|
#endif
|
|
HANDLE shared_handle () {return h;}
|
|
void set_acl ();
|
|
friend class _pinfo;
|
|
friend class winpids;
|
|
};
|
|
|
|
#define ISSTATE(p, f) (!!((p)->process_state & f))
|
|
#define NOTSTATE(p, f) (!((p)->process_state & f))
|
|
|
|
class winpids
|
|
{
|
|
bool make_copy;
|
|
DWORD npidlist;
|
|
DWORD *pidlist;
|
|
pinfo *pinfolist;
|
|
DWORD pinfo_access; // access type for pinfo open
|
|
DWORD enum_processes (bool winpid);
|
|
DWORD enum_init (bool winpid);
|
|
void add (DWORD& nelem, bool, DWORD pid);
|
|
public:
|
|
DWORD npids;
|
|
inline void reset () { release (); npids = 0;}
|
|
void set (bool winpid);
|
|
winpids (): make_copy (true) {}
|
|
winpids (int): make_copy (false), npidlist (0), pidlist (NULL),
|
|
pinfolist (NULL), pinfo_access (0), npids (0) {}
|
|
winpids (DWORD acc): make_copy (false), npidlist (0), pidlist (NULL),
|
|
pinfolist (NULL), pinfo_access (acc), npids (0)
|
|
{
|
|
set (0);
|
|
}
|
|
inline DWORD& winpid (int i) const {return pidlist[i];}
|
|
inline _pinfo *operator [] (int i) const {return (_pinfo *) pinfolist[i];}
|
|
~winpids ();
|
|
void release ();
|
|
};
|
|
|
|
extern __inline pid_t
|
|
cygwin_pid (pid_t pid)
|
|
{
|
|
return pid;
|
|
}
|
|
|
|
void __stdcall pinfo_init (char **, int);
|
|
extern pinfo myself;
|
|
|
|
/* Helper class to allow convenient setting and unsetting a process_state
|
|
flag in myself. This is used in certain fhandler read/write methods
|
|
to set the PID_TTYIN/PID_TTYOU flags in myself->process_state. */
|
|
class push_process_state
|
|
{
|
|
private:
|
|
int flag;
|
|
public:
|
|
push_process_state (int add_flag)
|
|
{
|
|
flag = add_flag;
|
|
myself->process_state |= flag;
|
|
}
|
|
void pop () { myself->process_state &= ~(flag); }
|
|
~push_process_state () { pop (); }
|
|
};
|
|
|
|
#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
|
|
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. */
|
|
#define _P_PATH_TYPE_EXEC 0x1000
|
|
|
|
/* Helper macro to mask actual mode and drop additional flags defined above. */
|
|
#define _P_MODE(x) ((x) & 0xfff)
|
|
|
|
#define __ctty() _ctty ((char *) alloca (sizeof ("ctty /dev/tty") + 20))
|
|
#define myctty() myself->__ctty ()
|
|
|
|
/* For mmaps across fork(). */
|
|
int __stdcall fixup_mmaps_after_fork (HANDLE parent);
|
|
/* for shm areas across fork (). */
|
|
int __stdcall fixup_shms_after_fork ();
|
|
|
|
void __stdcall fill_rusage (struct rusage *, HANDLE);
|
|
void __stdcall add_rusage (struct rusage *, struct rusage *);
|
|
#endif /*_PINFO_H*/
|